diff --git a/RFXtoRP_HsaLstCarSta_CarrierArrived.ftl b/RFXtoRP_HsaLstCarSta_CarrierArrived.ftl
index bf31116..1cd4134 100644
--- a/RFXtoRP_HsaLstCarSta_CarrierArrived.ftl
+++ b/RFXtoRP_HsaLstCarSta_CarrierArrived.ftl
@@ -5,11 +5,19 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-            <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
-                "RefID": "${carrier_apt_status.appointment_reference?json_string}",
+            <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true">
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
             <#else>
-                "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
-			</#if>
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
+            </#if>
             "RefDate": {
                "DateTime": "${ref_datetime}",
                "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl b/RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl
index dc4ed53..c5648cd 100644
--- a/RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl
+++ b/RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl
@@ -5,11 +5,19 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-   		    <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
-                "RefID": "${carrier_apt_status.appointment_reference?json_string}",
+   		   <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true">
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
             <#else>
-                "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
-			</#if>
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
+            </#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",
                "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl b/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl
index dc4ed53..4fe7837 100644
--- a/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl
+++ b/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl
@@ -5,11 +5,19 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-   		    <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
-                "RefID": "${carrier_apt_status.appointment_reference?json_string}",
+   		    <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true">
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
             <#else>
-                "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
-			</#if>
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
+            </#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",
                "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl b/RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl
index dc4ed53..4fe7837 100644
--- a/RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl
+++ b/RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl
@@ -5,11 +5,19 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-   		    <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
-                "RefID": "${carrier_apt_status.appointment_reference?json_string}",
+   		    <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true">
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
             <#else>
-                "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
-			</#if>
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
+            </#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",
                "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsaLstCarSta_LoadingStarted.ftl b/RFXtoRP_HsaLstCarSta_LoadingStarted.ftl
index dc4ed53..4fe7837 100644
--- a/RFXtoRP_HsaLstCarSta_LoadingStarted.ftl
+++ b/RFXtoRP_HsaLstCarSta_LoadingStarted.ftl
@@ -5,11 +5,19 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-   		    <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
-                "RefID": "${carrier_apt_status.appointment_reference?json_string}",
+   		    <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true">
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
             <#else>
-                "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
-			</#if>
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
+            </#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",
                "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl b/RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl
index dc4ed53..4fe7837 100644
--- a/RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl
+++ b/RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl
@@ -5,11 +5,19 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-   		    <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
-                "RefID": "${carrier_apt_status.appointment_reference?json_string}",
+   		    <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true">
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
             <#else>
-                "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
-			</#if>
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
+            </#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",
                "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl b/RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl
index dc4ed53..4fe7837 100644
--- a/RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl
+++ b/RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl
@@ -5,11 +5,19 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-   		    <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
-                "RefID": "${carrier_apt_status.appointment_reference?json_string}",
+   		    <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true">
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
             <#else>
-                "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
-			</#if>
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
+            </#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",
                "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl
index bdd79a1..d96a39e 100644
--- a/RFXtoRP_HsrCarrierApt.ftl
+++ b/RFXtoRP_HsrCarrierApt.ftl
@@ -12,11 +12,12 @@
 
 <#assign aDateTime = .now>
 
+<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+<#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)>
+
 <#switch cloudEventMsg.action>
   <#case "C">
        <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)>
        [
         {
           <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceBookAppointment>
@@ -24,23 +25,10 @@
           "datas" :
           <#include "RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl">
         }
-        <#if (carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false" && (carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") || carrier_apt.planned_unloading_end_datetime?starts_with("00") || carrier_apt.planned_unloading_end_datetime?contains("-00-"))) || (carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" && (carrier_apt.planned_load_start_datetime?starts_with("00") || carrier_apt.planned_load_start_datetime?contains("-00-") ||  carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-"))) || (carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true" && (carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-") || carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-")))>
-          <#stop "One of the datetime fields of appointment is not initialized" >
-        <#else>
-        ,
-        {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCustomFieldsUpdated>
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
-          <#include "RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl">
-        }
-        </#if>
        ]
   <#break>
     <#case "U">
     <#--   *********************************************** Action = Update ********************-->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)>
       [
         {
         <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCustomFieldsUpdated>
@@ -149,8 +137,6 @@
     <#break>
 <#case "D">
       <#-- *********************************************** Action = Delete ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)>
        [
        <#-- Ajout des lignes-->
         {
diff --git a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
index 6c72e5d..63a606f 100644
--- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
@@ -140,6 +140,8 @@
 							<#stop "planned_unloading_start_datetime field of appointmend is not initialized" >
 						</#if>
 						"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
+					<#else>
+						<#stop "Appointment type not supported" >
 					</#if>
 				</#if>
 			</#if>
diff --git a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl
index 1f40a65..dad33e2 100644
--- a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl
@@ -134,7 +134,12 @@
 			   		"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
 				<#else>
 					<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-						<#stop "Not managed">
+						<#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-")>
+							<#stop "planned_unloading_start_datetime field of appointmend is not initialized" >
+						</#if>
+						"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
+					<#else>
+						<#stop "Appointment type not supported" >
 					</#if>
 				</#if>
 			</#if>
diff --git a/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl b/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl
index b8a1d02..bd89dee 100644
--- a/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl
@@ -73,7 +73,9 @@
 							<#stop "planned_unloading_start_datetime field of appointmend is not initialized" >
 						</#if>
 						"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
-				</#if>
+					<#else>
+						<#stop "Appointment type not supported" >
+					</#if>	
 			</#if>
 		</#if>
 		}]
diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
index 8aff3af..79f720a 100644
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -9,6 +9,32 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
+    "CustomFields": [
+      {
+        "Key": "depot_code",
+        "Value": "${preparation_order.physical_depot_code?trim?json_string}"
+      },
+      {
+        "Key": "activity_code",
+        "Value": "${preparation_order.activity_code?trim?json_string}"
+      },
+      {
+        "Key": "originator_code",
+        "Value": "${preparation_order.originator_code?trim?json_string}"
+      },
+      {
+        "Key": "reference",
+        "Value": "${preparation_order.originator_reference?trim?json_string}"
+      },
+      {
+        "Key": "order_year",
+        "Value": "${preparation_order.preparation_order_year}"
+      },
+      {
+        "Key": "order_number",
+        "Value": "${preparation_order.preparation_order_number}"
+      }
+    ],
     "RefID": "${preparation_order.originator_reference?trim?json_string}",
     "RefDate": {
             "DateTime": "${pro_creation_datetime}",
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
index 0d3b976..8ee3c14 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -9,6 +9,32 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
+    "CustomFields": [
+      {
+        "Key": "depot_code",
+        "Value": "${receipt.physical_depot_code?trim?json_string}"
+      },
+      {
+        "Key": "activity_code",
+        "Value": "${receipt.activity_code?trim?json_string}"
+      },
+      {
+        "Key": "originator_code",
+        "Value": "${receipt.originator_code?trim?json_string}"
+      },
+      {
+        "Key": "reference",
+        "Value": "${receipt.receipt_reference?trim?json_string}"
+      },
+      {
+        "Key": "order_year",
+        "Value": "${receipt.receipt_year}"
+      },
+      {
+        "Key": "order_number",
+        "Value": "${receipt.receipt_number}"
+      }
+    ],
       <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
         "RefID": "${receipt.receipt_reference?trim?json_string}",
       <#else>
diff --git a/VERSION b/VERSION
index 96a492f..8ffb1a4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.54+3
+1.2.56+1