Release 1.2.58+1

Release 1.2.57+1
Merge branch 'release-1.2-SCPN1-10100' into 'release/1.2'
2026-02-05 17:13:36 +01:00 · 2026-02-05 10:17:24 +01:00 · 2026-02-05 08:31:43 +00:00 · 2026-02-05 08:55:09 +01:00 · 2026-02-02 11:59:14 +01:00 · 2026-01-27 08:55:35 +01:00
43 changed files with 673 additions and 316 deletions
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # HARDIS SC NETWORK Core FTLs
+
 ## Overview
-The **HARDIS WMS Connector** is a set of **FreeMarker templates (FTL)** designed to transform **outgoing JSON flows from HARDIS WMS** into **flows compatible with HARDIS SC NETWORK**.

 The **HARDIS WMS Connector** is a set of **FreeMarker templates (FTL)** designed to transform **outgoing JSON flows from HARDIS WMS** into **flows compatible with HARDIS SC NETWORK**.

--- 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.physical_depot?json_string}${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}"
--- 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.physical_depot?json_string}${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}"
--- 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.physical_depot?json_string}${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}"
--- 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.physical_depot?json_string}${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}"
--- 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.physical_depot?json_string}${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}"
--- 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.physical_depot?json_string}${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}"
--- 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.physical_depot?json_string}${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}"
--- a/RFXtoRP_HsrCarrierApt.ftl
+++ b/RFXtoRP_HsrCarrierApt.ftl
@@ -12,30 +12,23 @@

 <#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>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :
          <#include "RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl">
-        },
-        {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCustomFieldsUpdated>
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
-          <#include "RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl">
        }
       ]
  <#break>
    <#case "U">
    <#--   *********************************************** Action = Update ********************-->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)>
      [
        {
        <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCustomFieldsUpdated>
@@ -44,6 +37,7 @@
        <#include "RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl">
        },
      <#include "RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdated.ftl">
+      <#include "RFXtoRP_HsrCarrierApt_AppointmentCarrierInformationUpdated.ftl">
      <#if carrier_apt.status?? && (carrier_apt.status.status_code=="999" || carrier_apt.status.status_code=="040" || carrier_apt.status.status_code=="030")>
      [
        {
@@ -114,7 +108,6 @@
                    }
                  ]
                  <#else>
-                    <#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) && ((carrier_apt.unloading_appointment =="true" && carrier_apt.load_appointment =="false") || (carrier_apt.unloading_appointment =="false" && carrier_apt.load_appointment =="true"))>
                      [
                        {
                        <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteWMSUpdateAppointment>
@@ -123,16 +116,6 @@
                        <#include "RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl">
                        }
                      ]
-                    <#else>
-                    [
-                      {
-                      <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceRescheduleAppointment>
-                      "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                      "datas" :
-                      <#include "RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl">
-                      }
-                    ]
-                    </#if>
                  </#if>
                </#if>
              </#if>
@@ -144,8 +127,6 @@
    <#break>
 <#case "D">
      <#-- *********************************************** Action = Delete ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)>
       [
       <#-- Ajout des lignes-->
        {
--- a/RFXtoRP_HsrCarrierApt_AppointmentCarrierExpected.ftl
+++ b/RFXtoRP_HsrCarrierApt_AppointmentCarrierExpected.ftl
@@ -1,26 +0,0 @@
-[
-    <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.creation_datetime,time_zone_rfx) />
-    {
-        "Header": {
-            "ProjectID": "${projectRP}"
-        },
-        "ID": {
-        <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-            "RefID": "${carrier_apt.appointment_reference?json_string}",
-        <#else>
-            <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
-                "RefID": "${carrier_apt.appointment_reference?json_string}${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
-            <#else>
-                "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
-            </#if>
-		</#if>
-			"RefDate": {
-               "DateTime": "${ref_datetime}",
-               "AuthorTimeZone": "${time_zone_rfx}"
-			 }
-        },
-        "Payload":{
-            "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}"
-        }
-    }
-]
--- a/RFXtoRP_HsrCarrierApt_AppointmentCarrierInformationUpdated.ftl
+++ b/RFXtoRP_HsrCarrierApt_AppointmentCarrierInformationUpdated.ftl
@@ -0,0 +1,9 @@
+ <#-- A décommenter si besoin de les utiliser-->
+ <#-- Uncomment if you need to use them-->
+ <#--{
+        <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierInformationUpdated>
+        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+        "datas" :
+        <#include "RFXtoRP_HsrCarrierApt_AppointmentCarrierInformationUpdatedToConfigure.ftl">
+        },
+-->
--- a/RFXtoRP_HsrCarrierApt_AppointmentCarrierInformationUpdatedToConfigure.ftl
+++ b/RFXtoRP_HsrCarrierApt_AppointmentCarrierInformationUpdatedToConfigure.ftl
@@ -0,0 +1,42 @@
+<#--
+ [
+ {
+    "Header": {
+        "ProjectID": "${projectRP}"
+    },
+    "ID": {
+    <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+				"RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+			<#else>
+				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+			</#if>
+		<#else>
+			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+				"RefID": "${carrier_apt.appointment_reference?json_string}",
+			<#else>
+				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+			</#if>
+		</#if>
+    }
+    "Payload": {
+    "ActorID": "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+    <#--To configure-->
+<#--    "CarrierInformation": [
+        {
+        "Key": "string",
+        "Value": {
+        "Bool": "true / false",
+        "Float": 3.1415,
+        "Int": 42,
+        "String": "Hello World !",
+        "Timestamp": {
+            "AuthorTimeZone": "Europe/Paris",
+            "DateTime": "2023-01-01T00:00:00Z"
+        }
+        }
+    ]
+    }
+}
+]
+-->
--- a/RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl
+++ b/RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl
@@ -5,14 +5,18 @@
            "ProjectID": "${projectRP}"
        },
        "ID": {
-        <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-            "RefID": "${carrier_apt.appointment_reference?json_string}",
-        <#else>
-            <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
-                "RefID": "${carrier_apt.appointment_reference?json_string}${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
-            <#else>
-                "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
-            </#if>
+        <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+				"RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+			<#else>
+				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+			</#if>
+		<#else>
+			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+				"RefID": "${carrier_apt.appointment_reference?json_string}",
+			<#else>
+				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+			</#if>
 		</#if>
        "RefDate": {
            "DateTime": "${ref_datetime}",
@@ -38,6 +42,14 @@
            {
            "Key": "carrier",
            "Value": "${carrier_apt.planned_carrier?json_string}"
+            },
+			{
+			"Key": "loading",
+			"Value": "${carrier_apt.load_appointment?json_string}"
+			},
+			{
+			"Key": "unloading",
+			"Value": "${carrier_apt.unloading_appointment?json_string}"
            }
            ]
        },
--- a/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl
+++ b/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl
@@ -5,16 +5,20 @@
        "ProjectID": "${projectRP}"
    },
    "ID": {
-    <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-        "RefID": "${carrier_apt.appointment_reference?json_string}",
-    <#else>
-        <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
-            "RefID": "${carrier_apt.appointment_reference?json_string}${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
+    <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+        <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+            "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}"
        <#else>
-            "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
+            "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}"
+        </#if>
+    <#else>
+        <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+            "RefID": "${carrier_apt.appointment_reference?json_string}"
+        <#else>
+            "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}"
        </#if>
    </#if>
-    }
+    },
    "Payload": {
    "ActorID": "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
    <#--To configure-->
--- a/RFXtoRP_HsrCarrierApt_CarrierArrived.ftl
+++ b/RFXtoRP_HsrCarrierApt_CarrierArrived.ftl
@@ -5,11 +5,19 @@
            "ProjectID": "${projectRP}"
        },
        "ID": {
-            <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference !="">
-                "RefID": "${carrier_apt.appointment_reference?json_string}",
+            <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                <#else>
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                </#if>
            <#else>
-                "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}",
-			</#if>
+                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                </#if>
+            </#if>
            "RefDate": {
               "DateTime": "${ref_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrCarrierApt_CarrierDeparted.ftl
+++ b/RFXtoRP_HsrCarrierApt_CarrierDeparted.ftl
@@ -5,11 +5,19 @@
            "ProjectID": "${projectRP}"
        },
        "ID": {
-            <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference !="">
-                "RefID": "${carrier_apt.appointment_reference?json_string}",
+            <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                <#else>
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                </#if>
            <#else>
-                "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}",
-			</#if>
+                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                </#if>
+            </#if>
            "RefDate": {
               "DateTime": "${ref_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrCarrierApt_LoadingCompleted.ftl
+++ b/RFXtoRP_HsrCarrierApt_LoadingCompleted.ftl
@@ -5,11 +5,19 @@
            "ProjectID": "${projectRP}"
        },
        "ID": {
-            <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference !="">
-                "RefID": "${carrier_apt.appointment_reference?json_string}",
+            <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                <#else>
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                </#if>
            <#else>
-                "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}",
-			</#if>
+                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                </#if>
+            </#if>
            "RefDate": {
               "DateTime": "${ref_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrCarrierApt_LoadingStarted.ftl
+++ b/RFXtoRP_HsrCarrierApt_LoadingStarted.ftl
@@ -5,11 +5,19 @@
            "ProjectID": "${projectRP}"
        },
        "ID": {
-            <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference !="">
-                "RefID": "${carrier_apt.appointment_reference?json_string}",
+            <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                <#else>
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                </#if>
            <#else>
-                "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}",
-			</#if>
+                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                </#if>
+            </#if>
            "RefDate": {
               "DateTime": "${ref_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl
@@ -1,15 +1,19 @@
 <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.last_update_datetime,time_zone_rfx) />
 [
  {
-    <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+    <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+		<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+			"AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+		<#else>
+			"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+		</#if>
+	<#else>
+		<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
 			"AppointmentID": "${carrier_apt.appointment_reference?json_string}",
 		<#else>
-			<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
-				"AppointmentID": "${carrier_apt.appointment_reference?json_string}${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
-			<#else>
-				"AppointmentID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
-			</#if>
+			"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 		</#if>
+	</#if>
    "Header": {
      "ProjectID": "${projectRP}"
    },
--- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
@@ -4,13 +4,17 @@
          "ProjectID": "${projectRP}"
        },
 		"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-		<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-			"AppointmentID": "${carrier_apt.appointment_reference?json_string}",
-		<#else>
-			<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
-				"AppointmentID": "${carrier_apt.physical_depot?json_string}${carrier_apt.appointment_reference?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+		<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+				"AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			<#else>
-				"AppointmentID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
+				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+			</#if>
+		<#else>
+			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+				"AppointmentID": "${carrier_apt.appointment_reference?json_string}",
+			<#else>
+				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			</#if>
 		</#if>
 		"TimeZone":"${time_zone_rfx}",
@@ -71,6 +75,14 @@
 			{
 			"Key": "carrier",
 			"Value": "${carrier_apt.planned_carrier?json_string}"
+			},
+			{
+			"Key": "loading",
+			"Value": "${carrier_apt.load_appointment?json_string}"
+			},
+			{
+			"Key": "unloading",
+			"Value": "${carrier_apt.unloading_appointment?json_string}"
 			}
 		],
 		<#include "RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl">,
@@ -83,10 +95,11 @@
 					"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
 					<#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!="">
 						"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
+						"ExecutionflowID": "${physical_receipt.physical_receipt_reference?trim?json_string}",
 					<#else>
-						"OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
+						"OrderID": "${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
+						"ExecutionflowID": "${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
 					</#if>
-					"ExecutionflowID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
 					"ProjectID": "${projectRP}",
 		            <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
 				}<#sep>,</#sep>
@@ -100,16 +113,21 @@
                    <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
 				}
 			],
-			<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true" && carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!="">
-				"Reason": "LOAD AND UNLOADING / ${carrier_apt.appointment_designation?json_string}",
+			<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
+				"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
 			<#else>
 				<#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!="">
 					"Reason": "${carrier_apt.appointment_designation?json_string}",
 				<#else>
-					"Reason": "No commission",
+					<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+						"Reason": "${carrier_apt.appointment_reference?json_string}",
+					<#else>
+						"Reason": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+					</#if>
 				</#if>
 			</#if>
 		</#if>
+
 		"Slots": [{
 			<#-- calcul de de la durée en fonction des start et end time-->
 			    "DurationInSeconds": "${duration}",
@@ -130,6 +148,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>
--- a/RFXtoRP_HsrCarrierApt_UnloadingCompleted.ftl
+++ b/RFXtoRP_HsrCarrierApt_UnloadingCompleted.ftl
@@ -5,11 +5,19 @@
            "ProjectID": "${projectRP}"
        },
        "ID": {
-            <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference !="">
-                "RefID": "${carrier_apt.appointment_reference?json_string}",
+           <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                <#else>
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                </#if>
            <#else>
-                "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}",
-			</#if>
+                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                </#if>
+            </#if>
            "RefDate": {
               "DateTime": "${ref_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrCarrierApt_UnloadingStarted.ftl
+++ b/RFXtoRP_HsrCarrierApt_UnloadingStarted.ftl
@@ -5,11 +5,19 @@
            "ProjectID": "${projectRP}"
        },
        "ID": {
-            <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference !="">
-                "RefID": "${carrier_apt.appointment_reference?json_string}",
+            <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                <#else>
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                </#if>
            <#else>
-                "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}",
-			</#if>
+                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                </#if>
+            </#if>
            "RefDate": {
               "DateTime": "${ref_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl
@@ -5,13 +5,17 @@
        "Header":{
          "ProjectID": "${projectRP}"
        },
-		<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-			"AppointmentID": "${carrier_apt.appointment_reference?json_string}",
-		<#else>
-			<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
-				"AppointmentID": "${carrier_apt.appointment_reference?json_string}${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
+		<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+				"AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			<#else>
-				"AppointmentID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
+				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+			</#if>
+		<#else>
+			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+				"AppointmentID": "${carrier_apt.appointment_reference?json_string}",
+			<#else>
+				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			</#if>
 		</#if>
 		<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false">
@@ -52,6 +56,7 @@
 			</#if>
 		</#if>
 		"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+		"TimeZone":"${time_zone_rfx}",
 		"CustomFields": [
 			{
 			"Key": "depot",
@@ -72,25 +77,46 @@
 			{
 			"Key": "carrier",
 			"Value": "${carrier_apt.planned_carrier?json_string}"
+			},
+			{
+			"Key": "loading",
+			"Value": "${carrier_apt.load_appointment?json_string}"
+			},
+			{
+			"Key": "unloading",
+			"Value": "${carrier_apt.unloading_appointment?json_string}"
 			}
 		],
-	<#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0)>
+		<#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) && ((carrier_apt.unloading_appointment =="true" && carrier_apt.load_appointment =="false") || (carrier_apt.unloading_appointment =="false" && carrier_apt.load_appointment =="true"))>
 		"Commissions": [
 			<#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt>
 			{
 				"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
 				<#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!="">
 					"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
+					"ExecutionflowID":"${physical_receipt.physical_receipt_reference?json_string}",
 				<#else>
-					"OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
+					"OrderID": "${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
+					"ExecutionflowID": "${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
 				</#if>
-				"ExecutionflowID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
 				"ProjectID": "${projectRP}"
 			}<#sep>,</#sep>
 			</#list>
 			],
 	<#else>
-		<#stop>
+		<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
+			"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
+		<#else>
+			<#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!="">
+				"Reason": "${carrier_apt.appointment_designation?json_string}",
+			<#else>
+				<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+					"Reason": "${carrier_apt.appointment_reference?json_string}",
+				<#else>
+					"Reason": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+				</#if>
+			</#if>
+		</#if>
 	</#if>
 	"Slots": [{
 			<#-- calcul de de la durée en fonction des start et end time-->
@@ -109,7 +135,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>
--- a/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl
@@ -1,78 +0,0 @@
-[
-    {
-		<#assign creation_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.creation_datetime,time_zone_rfx) />
-        "Header":{
-          "ProjectID": "${projectRP}"
-        },
-		<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-			"AppointmentID": "${carrier_apt.appointment_reference?json_string}",
-		<#else>
-			<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
-				"AppointmentID": "${carrier_apt.appointment_reference?json_string}${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
-			<#else>
-				"AppointmentID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
-			</#if>
-		</#if>
-		"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-		<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false">
-        	<#if 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-")>
-			   <#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend is not initialized" >
-		   </#if>
-		   <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING>
-		   <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_unloading_end_datetime?datetime.iso) />
-		   <#if (duration <= 0)>
-			   <#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend are not valid" >
-		   </#if>
-		<#else>
-			<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" >
-			   <#if 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-")>
-			       <#stop "planned_load_start_datetime or planned_load_end_datetime field of appointmend is not initialized" >
-		       </#if>
-				<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_LOADING>
-				<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_load_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) />
-				<#if (duration <= 0)>
-					<#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend are not valid" >
-				</#if>
-			<#else>
-				<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-					<#if  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 "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend is not initialized" >
-		       		</#if>
-					<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING>
-					<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) />
-					<#if (duration <= 0)>
-						<#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" >
-					</#if>
-				<#else>
-					<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN>
-					<#assign duration = 0 />		<#-- à confirmer -->
-				</#if>
-			</#if>
-		</#if>
-	"Slots": [{
-		<#-- calcul de de la durée en fonction des start et end time-->
-			"DurationInSeconds": "${duration}",
-		<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false" >
-			<#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>
-			<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true">
-				<#if carrier_apt.planned_load_start_datetime?starts_with("00") || carrier_apt.planned_load_start_datetime?contains("-00-")>
-					<#stop "planned_load_start_datetime field of appointmend is not initialized" >
-				</#if>
-				"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
-			<#else>
-				<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-						<#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}"
-				</#if>
-			</#if>
-		</#if>
-		}]
-
-	}
-]
--- 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}",
--- 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>
--- a/RFXtoRP_RestResponse.ftl
+++ b/RFXtoRP_RestResponse.ftl
@@ -149,10 +149,10 @@
 				<#if preparationOrderPostResponse.status?? && (preparationOrderPostResponse.status == "SUCCESS" || preparationOrderPostResponse.status == "WARN")  >
 				[
 					{
-						<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
+						<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipToAcked>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
-						<#include "RFXtoRP_Receipt_ExecutionflowDeleted.ftl">
+						<#include "RFXtoRP_Receipt_ShipToAcked.ftl">
 					}
 				]
 				<#else>
@@ -212,10 +212,10 @@
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
-					<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 				}
 			]
 			<#break>
@@ -239,10 +239,10 @@
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
-						<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
-						<#include "RFXtoRP_RestResponseAllocationError.ftl">
+						<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 					}
 				]
 				</#if>
@@ -261,10 +261,10 @@
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
-					<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 				}
 			]
 			</#switch>
@@ -287,10 +287,10 @@
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
-					<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 				}
 			]
 			<#break>
@@ -314,10 +314,10 @@
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
-						<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
-						<#include "RFXtoRP_RestResponseAllocationError.ftl">
+						<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 					}
 				]
 				</#if>
@@ -336,10 +336,10 @@
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
-					<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 				}
 			]
 			</#switch>
@@ -362,10 +362,10 @@
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
-					<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 				}
 			]
 			<#break>
@@ -389,10 +389,10 @@
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
-						<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
-						<#include "RFXtoRP_RestResponseAllocationError.ftl">
+						<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 					}
 				]
 				</#if>
@@ -411,17 +411,19 @@
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
-					<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 				}
 			]
 			</#switch>
 			<#break>
-			<#-- *********************************************** ApiRestID = appointment_post_physical_receipt_associations ******************** -->
+			<#-- *********************************************** ApiRestID = appointment_post_physical_receipt_associations/dissociations ******************** -->
 	<#case "appointment_post_physical_receipt_associations_by_ref">
 	<#case "appointment_post_physical_receipt_associations_by_number">
+	<#case "appointment_post_physical_receipt_dissociations_by_ref">
+	<#case "appointment_post_physical_receipt_dissociations_by_number">
 		<#switch restResponsetMsg.status!no_status>
 			<#case no_status>
 			[
@@ -437,10 +439,10 @@
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
-					<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 				}
 			]
 			<#break>
@@ -464,10 +466,10 @@
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
-						<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
-						<#include "RFXtoRP_RestResponseAllocationError.ftl">
+						<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 					}
 				]
 				</#if>
@@ -486,10 +488,10 @@
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
-					<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 				}
 			]
 			</#switch>
--- a/RFXtoRP_RestResponseAppointmentAllocationError.ftl
+++ b/RFXtoRP_RestResponseAppointmentAllocationError.ftl
@@ -0,0 +1,22 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
+[
+  {
+    "Header": {
+      "ProjectID": "${projectRP}"
+    },
+    "ID": {
+        "RefID": "${id.refid!"no RefID"?trim?json_string}",
+       "RefDate": {
+        "DateTime": "${aDateTime?iso_utc}",
+        "AuthorTimeZone": "${time_zone_rfx}"
+      }
+    },
+
+    "Payload": {
+      "ActorID":"${RFXtoRPprefixDepot(id.actorID)?trim?json_string}"
+    }
+
+  }
+]
--- a/RPtoRFX_AppointmentEvent.ftl
+++ b/RPtoRFX_AppointmentEvent.ftl
@@ -26,29 +26,68 @@
 <#-- *********************************************** Action = CommissionsUpdated ******************** -->
 	<#case "CommissionsUpdated">
 		<#assign appointment = eventRP.data />
-		[
-			<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as commission>
-			<#if eventRP.appointmentCustomFields?has_content>
+		[	<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
+				<#if eventRP.addedCommissions?? && eventRP.addedCommissions!="">				    
+					<#if eventRP.appointmentCustomFields?has_content>
+						{
+							<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
+							"apiRestReflexID" :  "${apiRestReflexID}",
+							"datas" :
+							<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl">
+						}
+						<#else>
+						{
+							<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_ref>
+							"apiRestReflexID" :  "${apiRestReflexID}",
+							"datas" :
+							<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
+						}
+					</#if>
+				</#if>
+				<#if eventRP.removedCommissions?? && eventRP.removedCommissions!="">
+					<#if eventRP.addedCommissions?? && eventRP.addedCommissions!="">
+					   ,
+					</#if>	
+
+					<#if eventRP.appointmentCustomFields?has_content>
+					{
+						<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_dissociations_by_number>
+						"apiRestReflexID" :  "${apiRestReflexID}",
+						"datas" :
+						<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByNumber.ftl">
+					}
+					<#else>
+					{
+						<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_dissociations_by_ref>
+						"apiRestReflexID" :  "${apiRestReflexID}",
+						"datas" :
+						<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl">
+					}
+					</#if>
+				</#if>
+			<#else>
+				<#if eventRP.appointmentCustomFields?has_content>
 				{
-					<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
+					<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_number>
 					"apiRestReflexID" :  "${apiRestReflexID}",
 					"datas" :
-					<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl">
+					<#include "RPtoRFX_CarrierAppointmentReasonUpdatedByNumber.ftl">
 				}
 				<#else>
 				{
-					<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_ref>
+					<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_ref>
 					"apiRestReflexID" :  "${apiRestReflexID}",
 					"datas" :
-					<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
+					<#include "RPtoRFX_CarrierAppointmentReasonUpdatedByRef.ftl">
 				}
+				</#if>
 			</#if>
-			<#sep>,</#sep>
-			</#list>
 		]
 	<#break>
-<#-- *********************************************** Action = SlotUpdated ******************** -->
+<#-- *********************************************** Action = SlotUpdated or CarrierInformationUpdated ******************** -->
 	<#case "SlotUpdated">
+	<#case "CarrierInformationUpdated">
+	<#case "ReasonUpdated">
 		<#assign appointment = eventRP.data />
 		[
 			<#if eventRP.appointmentCustomFields?has_content>
@@ -56,14 +95,14 @@
 				<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_number>
 				"apiRestReflexID" :  "${apiRestReflexID}",
 				"datas" :
-				<#include "RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl">
+				<#include "RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl">
 			}
 			<#else>
 			{
 				<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_ref>
 				"apiRestReflexID" :  "${apiRestReflexID}",
 				"datas" :
-				<#include "RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl">
+				<#include "RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl">
 			}
 			</#if>
 		]
--- a/RPtoRFX_CarrierAppointmentCanceledByNumber.ftl
+++ b/RPtoRFX_CarrierAppointmentCanceledByNumber.ftl
@@ -1,5 +1,5 @@
 {
-	"id" : {"refid" : "${eventRP.refid?json_string}"},
+	"id" : {"refid" : "${eventRP.refid?json_string}","actorID":"${RPtoRFXprefixDepot(eventRP.actor)}"},
 	"route" : "rest/public/v1/physical_depots/{physical_depot_code}/appointment_years/{appointment_year}/appointment_numbers/{appointment_number}/status",
 	"method" : "PUT",
 	"uri_substitutions": {
--- a/RPtoRFX_CarrierAppointmentCanceledByRef.ftl
+++ b/RPtoRFX_CarrierAppointmentCanceledByRef.ftl
@@ -1,5 +1,5 @@
 {
-	"id" : {"refid" : "${eventRP.refid?json_string}"},
+	"id" : {"refid" : "${eventRP.refid?json_string}","actorID":"${RPtoRFXprefixDepot(eventRP.actor)}"},
 	"route" : "rest/public/v1/physical_depots/{physical_depot_code}/carrier_appointments/{appointment_reference}/status",
 	"method" : "PUT",
 	"uri_substitutions": {
--- a/RPtoRFX_CarrierAppointmentCancellationCode.ftl
+++ b/RPtoRFX_CarrierAppointmentCancellationCode.ftl
@@ -1,2 +1,2 @@
-<#-- To custom with cancellation reason code-->
+<#-- To custom with cancellation reason code, the reason code must be cancellation type-->
 "cancellation_reason_code": ""
--- a/RPtoRFX_CarrierAppointmentCreated.ftl
+++ b/RPtoRFX_CarrierAppointmentCreated.ftl
@@ -1,5 +1,5 @@
 {
-	"id" : {"refid" : "${eventRP.refid?json_string}"},
+	"id" : {"refid" : "${eventRP.refid?json_string}","actorID":"${RPtoRFXprefixDepot(eventRP.actor)}"},
 	"route" : "rest/public/v1/physical_depots/{physical_depot_code}/carrier_appointments",
 	"method" : "POST",
 	"uri_substitutions": {
@@ -56,9 +56,7 @@
 				</#if>
 			<#else>
 				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
-					<#if appointment.Commissions[0].OrderID ?? && appointment.Commissions[0].OrderID!="">
-						"appointment_designation":"LOADING",
-					<#else>
+					<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
 						"appointment_designation":"${(appointment.Reason!"")?json_string}",
 					</#if>
 				</#if>
--- a/RPtoRFX_CarrierAppointmentDataUpdated.ftl
+++ b/RPtoRFX_CarrierAppointmentDataUpdated.ftl
@@ -0,0 +1,21 @@
+<#-- Note : you can use Order Line Metadata, using the define map : Line_MetaData_Map  -->
+<#-- Note : you can use Order Line Segmentation keys, using the define map : SegmentationKeys_Map  -->
+
+<#-- How to use MD or SK map
+    <#if appointment.CarrierInformation??>
+        <#assign CarrierInformation_Map = JsonUtil.sequenceToMap(appointment.CarrierInformation, "Key", "Value") />
+        <#if CarrierInformation_Map["Immatriculation"]??>
+            <#assign registration_number1 = CarrierInformation_Map["Immatriculation"].String!""/>
+            "registration_number":"${registration_number1}",
+        <#else>
+            "registration_number":"no plate number",
+        </#if>
+    </#if>
+
+    If your SK is :
+        Boolean : .Bool
+        Float : .Float
+        Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone
+        Int : .Int
+        String : .String
+-->
--- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl
+++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl
@@ -1,5 +1,5 @@
 {
-	"id" : {"refid" : "${eventRP.refid?json_string}"},
+	"id" : {"refid" : "${eventRP.refid?json_string}","actorID":"${RPtoRFXprefixDepot(eventRP.actor)}"},
 	"route" : "rest/public/v1/physical_depots/{physical_depot_code}/appointment_years/{appointment_year}/appointment_numbers/{appointment_number}/physical_receipt_associations",
 	"method" : "POST",
 	"uri_substitutions": {
@@ -9,22 +9,18 @@
 	},
 	"payload" :
 	 {
-		<#if appointment.Commissions??>
-			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
-				"physical_receipt_list": [
-				{
-					"receipt_activity": "${commission.value.activity_code?json_string}",
-					"originator_code": "${commission.value.originator_code?json_string}",
-					"physical_receipt_reference": "${commission.value.reference?json_string}",
-					"receipt_year": "${commission.value.order_year?json_string}",
-					"receipt_number": "${commission.value.order_number?json_string}"
-				}
-				]
-			<#else>
-				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
-					"appointment_designation":"${appointment.Reason!""?json_string}"
-				</#if>
-			</#if>
-		</#if>
+		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
+		"physical_receipt_list": [
+		<#list eventRP.addedCommissions as addedCommission>
+		{
+			"receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}",
+			"originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}",
+			"physical_receipt_reference": "${executionflowCustomFields[addedCommission.ExecutionflowID].reference?json_string}",
+			"receipt_year": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_year?json_string}",
+			"receipt_number": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_number?json_string}"
+		}
+		<#sep>,</#sep>
+		</#list>
+		]
 	 }
 }
--- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl
+++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl
@@ -1,5 +1,5 @@
 {
-	"id" : {"refid" : "${eventRP.refid?json_string}"},
+	"id" : {"refid" : "${eventRP.refid?json_string}","actorID":"${RPtoRFXprefixDepot(eventRP.actor)}"},
 	"route" : "rest/public/v1/physical_depots/{physical_depot_code}/carrier_appointments/{appointment_reference}/physical_receipt_associations",
 	"method" : "POST",
 	"uri_substitutions": {
@@ -8,22 +8,18 @@
 	},
 	"payload" :
 	 {
-		<#if appointment.Commissions??>
-			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
-				"physical_receipt_list": [
-				{
-					"receipt_activity": "${commission.value.activity_code?json_string}",
-					"originator_code": "${commission.value.originator_code?json_string}",
-					"physical_receipt_reference": "${commission.value.reference?json_string}",
-					"receipt_year": "${commission.value.order_year?json_string}",
-					"receipt_number": "${commission.value.order_number?json_string}"
-				}
-				]
-			<#else>
-				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
-					"appointment_designation":"${appointment.Reason!""?json_string}"
-				</#if>
-			</#if>
-		</#if>
+		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
+		"physical_receipt_list": [
+		<#list eventRP.addedCommissions as addedCommission>
+		{
+			"receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}",
+			"originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}",
+			"physical_receipt_reference": "${executionflowCustomFields[addedCommission.ExecutionflowID].reference?json_string}",
+			"receipt_year": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_year?json_string}",
+			"receipt_number": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_number?json_string}"
+		}
+		<#sep>,</#sep>
+		</#list>
+		]
 	 }
 }
--- a/RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByNumber.ftl
+++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByNumber.ftl
@@ -0,0 +1,26 @@
+{
+	"id" : {"refid" : "${eventRP.refid?json_string}","actorID":"${RPtoRFXprefixDepot(eventRP.actor)}"},
+	"route" : "rest/public/v1/physical_depots/{physical_depot_code}/appointment_years/{appointment_year}/appointment_numbers/{appointment_number}/physical_receipt_dissociations",
+	"method" : "POST",
+	"uri_substitutions": {
+		"physical_depot_code": "${RPtoRFXprefixDepot(eventRP.actor)}",
+        "appointment_year":"${eventRP.appointmentCustomFields.year?json_string}",
+		"appointment_number":"${eventRP.appointmentCustomFields.number?json_string}"
+	},
+	"payload" :
+	 {
+		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
+		"physical_receipt_list": [
+		<#list eventRP.removedCommissions as removedCommission>
+		{
+			"receipt_activity": "${executionflowCustomFields[removedCommission.ExecutionflowID].activity_code?json_string}",
+			"originator_code": "${executionflowCustomFields[removedCommission.ExecutionflowID].originator_code?json_string}",
+			"physical_receipt_reference": "${executionflowCustomFields[removedCommission.ExecutionflowID].reference?json_string}",
+			"receipt_year": "${executionflowCustomFields[removedCommission.ExecutionflowID].order_year?json_string}",
+			"receipt_number": "${executionflowCustomFields[removedCommission.ExecutionflowID].order_number?json_string}"
+		}
+		<#sep>,</#sep>
+		</#list>
+		]
+	 }
+ }
--- a/RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl
+++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl
@@ -0,0 +1,25 @@
+{
+	"id" : {"refid" : "${eventRP.refid?json_string}","actorID":"${RPtoRFXprefixDepot(eventRP.actor)}"},
+	"route" : "rest/public/v1/physical_depots/{physical_depot_code}/carrier_appointments/{appointment_reference}/physical_receipt_dissociations",
+	"method" : "POST",
+	"uri_substitutions": {
+		"physical_depot_code": "${RPtoRFXprefixDepot(eventRP.actor)}",
+        "appointment_reference":"${eventRP.refid?json_string}"
+	},
+	"payload" :
+	 {
+		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
+		"physical_receipt_list": [
+		<#list eventRP.removedCommissions as removedCommission>
+		{
+			"receipt_activity": "${executionflowCustomFields[removedCommission.ExecutionflowID].activity_code?json_string}",
+			"originator_code": "${executionflowCustomFields[removedCommission.ExecutionflowID].originator_code?json_string}",
+			"physical_receipt_reference": "${executionflowCustomFields[removedCommission.ExecutionflowID].reference?json_string}",
+			"receipt_year": "${executionflowCustomFields[removedCommission.ExecutionflowID].order_year?json_string}",
+			"receipt_number": "${executionflowCustomFields[removedCommission.ExecutionflowID].order_number?json_string}"
+		}
+		<#sep>,</#sep>
+		</#list>
+		]
+	 }
+ }
--- a/RPtoRFX_CarrierAppointmentReasonUpdatedByNumber.ftl
+++ b/RPtoRFX_CarrierAppointmentReasonUpdatedByNumber.ftl
@@ -0,0 +1,38 @@
+{
+	"id" : {"refid" : "${eventRP.refid?json_string}","actorID":"${RPtoRFXprefixDepot(eventRP.actor)}"},
+	"route" : "rest/public/v1/physical_depots/{physical_depot_code}/appointment_years/{appointment_year}/appointment_numbers/{appointment_number}",
+	"method" : "PUT",
+	"uri_substitutions": {
+		"physical_depot_code": "${RPtoRFXprefixDepot(eventRP.actor)}",
+		"appointment_year":"${eventRP.appointmentCustomFields.year?json_string}",
+		"appointment_number":"${eventRP.appointmentCustomFields.number?json_string}"
+	},
+	"payload" :
+	 {
+		"unloading_appointment" : "${eventRP.appointmentCustomFields.unloading?json_string}",
+		"load_appointment" : "${eventRP.appointmentCustomFields.loading?json_string}",
+		<#switch appointment.AppointmentType>
+	       <#case "APPOINTMENT_TYPE_LOADING">
+				<#if appointment.TimeZone?? && appointment.TimeZone!="">
+					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+				<#else>
+					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
+					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
+				</#if>
+		   <#break>
+		   <#case  "APPOINTMENT_TYPE_UNLOADING">
+				<#if appointment.TimeZone?? && appointment.TimeZone!="">
+					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+		   		<#else>
+					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
+					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
+		   		</#if>
+			<#break>
+	       <#default>
+	         <#stop "appointment.AppointmentType not implemented" >
+        </#switch>
+		"appointment_designation":"${(appointment.Reason!"")!?json_string}"
+	 }
+ }
--- a/RPtoRFX_CarrierAppointmentReasonUpdatedByRef.ftl
+++ b/RPtoRFX_CarrierAppointmentReasonUpdatedByRef.ftl
@@ -0,0 +1,39 @@
+{
+	"id" : {"refid" : "${eventRP.refid?json_string}","actorID":"${RPtoRFXprefixDepot(eventRP.actor)}"},
+	"route" : "rest/public/v1/physical_depots/{physical_depot_code}/carrier_appointments/{appointment_reference}",
+	"method" : "PUT",
+	"uri_substitutions": {
+		"physical_depot_code": "${RPtoRFXprefixDepot(eventRP.actor)}",
+		"appointment_reference":"${eventRP.refid?json_string}"
+	},
+	"payload" :
+	 {
+		<#switch appointment.AppointmentType>
+	       <#case "APPOINTMENT_TYPE_LOADING">
+		   		"unloading_appointment" : "false",
+				"load_appointment" : "true",
+				<#if appointment.TimeZone?? && appointment.TimeZone!="">
+					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+				<#else>
+					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
+					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
+				</#if>
+			<#break>
+		   	<#case  "APPOINTMENT_TYPE_UNLOADING">
+				"unloading_appointment" : "true",
+				"load_appointment" : "false",
+				<#if appointment.TimeZone?? && appointment.TimeZone!="">
+					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+		   		<#else>
+					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
+					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
+		   		</#if>
+			<#break>
+	       <#default>
+	         <#stop "appointment.AppointmentType not implemented" >
+        </#switch>
+		"appointment_designation":"${(appointment.Reason!"")!?json_string}"
+	 }
+ }
--- a/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl
+++ b/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl
@@ -1,5 +1,5 @@
 {
-	"id" : {"refid" : "${eventRP.refid?json_string}"},
+	"id" : {"refid" : "${eventRP.refid?json_string}","actorID":"${RPtoRFXprefixDepot(eventRP.actor)}"},
 	"route" : "rest/public/v1/physical_depots/{physical_depot_code}/appointment_years/{appointment_year}/appointment_numbers/{appointment_number}",
 	"method" : "PUT",
 	"uri_substitutions": {
@@ -9,10 +9,11 @@
 	},
 	"payload" :
 	 {
-       <#switch appointment.AppointmentType>
+		<#include "RPtoRFX_CarrierAppointmentDataUpdated.ftl">
+		"unloading_appointment" : "${eventRP.appointmentCustomFields.unloading?json_string}",
+		"load_appointment" : "${eventRP.appointmentCustomFields.loading?json_string}",
+       	<#switch appointment.AppointmentType>
 	       <#case "APPOINTMENT_TYPE_LOADING">
-				"unloading_appointment" : "false",
-				"load_appointment" : "true",
 				<#if appointment.TimeZone?? && appointment.TimeZone!="">
 					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
 					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
@@ -22,8 +23,6 @@
 				</#if>
 			<#break>
 		   <#case  "APPOINTMENT_TYPE_UNLOADING">
-		       "unloading_appointment" : "true",
-			   "load_appointment" : "false",
 			   <#if appointment.TimeZone?? && appointment.TimeZone!="">
 					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
 					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
--- a/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl
+++ b/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl
@@ -1,5 +1,5 @@
 {
-	"id" : {"refid" : "${eventRP.refid?json_string}"},
+	"id" : {"refid" : "${eventRP.refid?json_string}","actorID":"${RPtoRFXprefixDepot(eventRP.actor)}"},
 	"route" : "rest/public/v1/physical_depots/{physical_depot_code}/carrier_appointments/{appointment_reference}",
 	"method" : "PUT",
 	"uri_substitutions": {
@@ -8,9 +8,10 @@
 	},
 	"payload" :
 	 {
+		<#include "RPtoRFX_CarrierAppointmentDataUpdated.ftl">
       <#switch appointment.AppointmentType>
 	       <#case "APPOINTMENT_TYPE_LOADING">
-				"unloading_appointment" : "false",
+		   		"unloading_appointment" : "false",
 				"load_appointment" : "true",
 				<#if appointment.TimeZone?? && appointment.TimeZone!="">
 					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
@@ -21,8 +22,8 @@
 				</#if>
 			<#break>
 		   <#case  "APPOINTMENT_TYPE_UNLOADING">
-		       "unloading_appointment" : "true",
-			   "load_appointment" : "false",
+		   		"unloading_appointment" : "true",
+				"load_appointment" : "false",
 			   <#if appointment.TimeZone?? && appointment.TimeZone!="">
 					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
 					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
--- a/2
+++ b/2
@@ -1 +1 @@
-1.2.52+2
+1.2.58+1
Author	SHA1	Message	Date
Francis Reat	c542805488	Release 1.2.58+1	2026-02-05 17:13:36 +01:00
Francis Reat	29713e51d4	Release 1.2.57+1	2026-02-05 10:17:24 +01:00
Francis Reat	5fcc1a071d	Merge branch 'release-1.2-SCPN1-10100' into 'release/1.2' release-1.2-SCPN1-10100 into release/1.2 See merge request r-d-technique/tiers/reflex-wms-connector!238	2026-02-05 08:31:43 +00:00
Laurie Montant	c694bd1b63	SCPN1-10100 (cherry picked from commit `d507003c2b`)	2026-02-05 08:55:09 +01:00
Francis Reat	8dc7e1895f	SCPN1-10100	2026-02-02 11:59:14 +01:00
Francis Reat	74522e1b11	Release 1.2.56+2	2026-01-27 08:55:35 +01:00
Francis Reat	71a7001af1	Merge branch 'release1.2-SCPN1-10095' into 'release/1.2' release1.2-SCPN1-10095 into release/1.2 See merge request r-d-technique/tiers/reflex-wms-connector!231	2026-01-27 07:53:04 +00:00
Laurie Montant	f8e00cf7ba	SCPN1-10095 (cherry picked from commit `3b36b44aea`)	2026-01-27 08:36:29 +01:00
Laurie Montant	cf964959af	SCPN1-10095 (cherry picked from commit `fcad79967e`)	2026-01-26 16:01:29 +01:00
Francis Reat	7d55f08194	Release 1.2.56+1	2026-01-22 15:34:14 +01:00
Francis Reat	f96d8b9f09	Release 1.2.55+1	2026-01-22 15:32:21 +01:00
Francis Reat	642ce4e4e2	Merge branch 'release1.2-fixv12' into 'release/1.2' release1.2-fixv12 into release/1.2 See merge request r-d-technique/tiers/reflex-wms-connector!228	2026-01-22 13:20:11 +00:00
Francis Reat	50dca97d7a	Merge branch 'develop-1.2' into release1.2-fixv12	2026-01-21 17:19:37 +01:00
Laurie Montant	ff5d6bc4d3	SCPN1-10068	2026-01-21 14:48:58 +01:00
Laurie Montant	f49eb55d6a	Merge branch 'develop-1.2' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop-1.2	2026-01-21 10:56:20 +01:00
Laurie Montant	2ed20478c4	SCPN1-10068	2026-01-21 10:56:14 +01:00
Francis Reat	d3cb8ecc15	rollback	2026-01-20 15:09:51 +01:00
Francis Reat	e53d81e534	fix error syntax	2026-01-16 16:55:43 +01:00
Laurie Montant	2ece576560	SCPN1-10040	2026-01-15 17:21:47 +01:00
Laurie Montant	629d465343	SCPN1-10040	2026-01-15 15:37:58 +01:00
Francis Reat	0a34359e12	rollback	2026-01-15 09:31:58 +01:00
Laurie Montant	d908f7db77	SCPN1-9991	2026-01-14 11:03:00 +01:00
Francis Reat	7329a2aa1c	Release 1.2.54+3	2026-01-14 09:26:14 +01:00
Francis Reat	e83b921cf3	Merge branch 'SCPN1-9990' into 'release/1.2' SCPN1-9682 See merge request r-d-technique/tiers/reflex-wms-connector!224	2026-01-14 08:19:10 +00:00
Laurie Montant	f496ad60bd	SCPN1-9682 (cherry picked from commit `ca9706e5aa`)	2026-01-14 09:16:08 +01:00
Laurie Montant	ca9706e5aa	SCPN1-9682	2026-01-14 09:05:37 +01:00
Francis Reat	5977dc3af0	hsrAntRec (cherry picked from commit `efddfdc821`)	2026-01-13 18:09:24 +01:00
Francis Reat	4496a4a2ce	hsrAntRec	2026-01-13 18:01:25 +01:00
Francis Reat	7e57d91cb6	The loading and unloading appointment is not yet managed.	2026-01-09 15:37:25 +01:00
Francis Reat	c89575e040	Release 1.2.54+2	2026-01-08 17:52:51 +01:00
Francis Reat	6657cec64c	Merge branch 'release-1.2-fix-1.12-FTL' into 'release/1.2' release-1.2-fix-1.12-FTL into release/1.2 See merge request r-d-technique/tiers/reflex-wms-connector!220	2026-01-08 16:45:55 +00:00
Francis Reat	c0f25565a0	SCPN1-9943 (cherry picked from commit `a6fec0c333`) (cherry picked from commit `6e89261c27`)	2026-01-08 15:38:46 +01:00
Francis Reat	6e89261c27	SCPN1-9943 (cherry picked from commit `a6fec0c333`)	2026-01-08 15:29:55 +01:00
Vincent LE MAÎTRE	466e852f24	Release 1.2.54+1	2026-01-08 10:28:20 +01:00
Vincent LE MAÎTRE	8d5dafdeb5	Release 1.2.53+1	2026-01-08 08:52:16 +01:00
Francis Reat	bbfe3aa53a	Merge branch 'release-1.2-fix-1.12-FTL' into 'release/1.2' release-1.2-fix-1.12-FTL See merge request r-d-technique/tiers/reflex-wms-connector!214	2026-01-07 16:55:36 +00:00
Francis Reat	9ef729bba9	Merge branch 'develop-1.2' into release-1.2-fix-1.12-FTL	2026-01-07 16:26:10 +01:00
Francis Reat	d486819b60	rdz	2026-01-07 15:59:35 +01:00
Laurie Montant	d552dced98	RDV	2026-01-07 14:48:39 +01:00
Laurie Montant	ad8aae90fd	RDV	2026-01-07 14:08:00 +01:00
Laurie Montant	ecc40ff1f5	RDV	2026-01-07 12:00:14 +01:00
Laurie Montant	7c04741bc6	RDV	2026-01-07 11:50:16 +01:00
Laurie Montant	3541a6cf8d	RDV	2026-01-07 11:38:30 +01:00
Laurie Montant	0274bd65da	RDV	2026-01-07 11:35:25 +01:00
Laurie Montant	6f73a656ed	RDV	2026-01-07 11:16:57 +01:00
Laurie Montant	df7e596a93	RDV	2026-01-07 09:08:23 +01:00
Laurie Montant	5abbd7b0a2	RDV	2026-01-05 17:39:23 +01:00
Laurie Montant	a2d3922fb3	RDV	2026-01-05 16:06:09 +01:00
Laurie Montant	50366dab9e	RDV	2026-01-02 09:30:57 +01:00
@@ -1 +1 @@
 .2.52+2
 .2.58+1