Merge branch 'release-2.0-fix-1.12-FTL' into 'release/2.0'

release-2.0-fix-1.12-FTL

See merge request r-d-technique/tiers/reflex-wms-connector!215

RFXtoRP_HsaLstCarSta_CarrierArrived.ftl

@@ -8,7 +8,7 @@
             <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
                 "RefID": "${carrier_apt_status.appointment_reference?json_string}",
             <#else>
-                "RefID": "${carrier_apt_status.physical_depot?json_string}${carrier_apt_status.appointment_year_number?json_string}${carrier_apt_status.appointment_number?json_string}",
+                "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
 			</#if>
             "RefDate": {
                "DateTime": "${ref_datetime}",

RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl

@@ -8,7 +8,7 @@
    		    <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
                 "RefID": "${carrier_apt_status.appointment_reference?json_string}",
             <#else>
-                "RefID": "${carrier_apt_status.physical_depot?json_string}${carrier_apt_status.appointment_year_number?json_string}${carrier_apt_status.appointment_number?json_string}",
+                "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
 			</#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",

RFXtoRP_HsaLstCarSta_CarrierExpected.ftl

@@ -8,7 +8,7 @@
    		    <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
                 "RefID": "${carrier_apt_status.appointment_reference?json_string}",
             <#else>
-                "RefID": "${carrier_apt_status.physical_depot?json_string}${carrier_apt_status.appointment_year_number?json_string}${carrier_apt_status.appointment_number?json_string}",
+                "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
 			</#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",

RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl

@@ -8,7 +8,7 @@
    		    <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
                 "RefID": "${carrier_apt_status.appointment_reference?json_string}",
             <#else>
-                "RefID": "${carrier_apt_status.physical_depot?json_string}${carrier_apt_status.appointment_year_number?json_string}${carrier_apt_status.appointment_number?json_string}",
+                "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
 			</#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",

RFXtoRP_HsaLstCarSta_LoadingStarted.ftl

@@ -8,7 +8,7 @@
    		    <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
                 "RefID": "${carrier_apt_status.appointment_reference?json_string}",
             <#else>
-                "RefID": "${carrier_apt_status.physical_depot?json_string}${carrier_apt_status.appointment_year_number?json_string}${carrier_apt_status.appointment_number?json_string}",
+                "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
 			</#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",

RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl

@@ -8,7 +8,7 @@
    		    <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
                 "RefID": "${carrier_apt_status.appointment_reference?json_string}",
             <#else>
-                "RefID": "${carrier_apt_status.physical_depot?json_string}${carrier_apt_status.appointment_year_number?json_string}${carrier_apt_status.appointment_number?json_string}",
+                "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
 			</#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",

RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl

@@ -8,7 +8,7 @@
    		    <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
                 "RefID": "${carrier_apt_status.appointment_reference?json_string}",
             <#else>
-                "RefID": "${carrier_apt_status.physical_depot?json_string}${carrier_apt_status.appointment_year_number?json_string}${carrier_apt_status.appointment_number?json_string}",
+               "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
 			</#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",

RFXtoRP_HsrCarrierApt.ftl

@@ -23,13 +23,18 @@
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "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">

RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl

@@ -5,13 +5,17 @@
             "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}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+			<#else>
+				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+			</#if>
+		<#else>
 			<#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.year_number}-${carrier_apt.appointment_number}",
-                "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": {

RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl

@@ -5,13 +5,17 @@
         "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.appointment_reference?? && carrier_apt.appointment_reference!="">
+				"AppointmentID": "${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}",
+				"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>
     }

RFXtoRP_HsrCarrierApt_CarrierArrived.ftl

@@ -5,10 +5,18 @@
             "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}",
+                    "AppointmentID": "${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 -->
                 <#else>
-                "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                </#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>
             "RefDate": {
                "DateTime": "${ref_datetime}",

RFXtoRP_HsrCarrierApt_CarrierDeparted.ftl

@@ -5,10 +5,18 @@
             "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}",
+                    "AppointmentID": "${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 -->
                 <#else>
-                "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                </#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>
             "RefDate": {
                "DateTime": "${ref_datetime}",

RFXtoRP_HsrCarrierApt_LoadingCompleted.ftl

@@ -5,10 +5,18 @@
             "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}",
+                    "AppointmentID": "${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 -->
                 <#else>
-                "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                </#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>
             "RefDate": {
                "DateTime": "${ref_datetime}",

RFXtoRP_HsrCarrierApt_LoadingStarted.ftl

@@ -5,10 +5,18 @@
             "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}",
+                    "AppointmentID": "${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 -->
                 <#else>
-                "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                </#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>
             "RefDate": {
                "DateTime": "${ref_datetime}",

RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl

@@ -4,13 +4,17 @@
           "ProjectID": "${projectRP}"
         },
 		"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+		<#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}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+			<#else>
+				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+			</#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.year_number}-${carrier_apt.appointment_number}",
-				"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 -->
-			<#else>
-				"AppointmentID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
 			</#if>
 		</#if>
 		"TimeZone":"${time_zone_rfx}",
@@ -101,12 +105,16 @@
 				}
 			],
 			<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-				"Reason": "LOAD AND UNLOADING / ${carrier_apt.appointment_designation?json_string}",
+				"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>

RFXtoRP_HsrCarrierApt_UnloadingCompleted.ftl

@@ -5,10 +5,18 @@
             "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}",
+                    "AppointmentID": "${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 -->
                 <#else>
-                "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                </#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>
             "RefDate": {
                "DateTime": "${ref_datetime}",

RFXtoRP_HsrCarrierApt_UnloadingStarted.ftl

@@ -5,10 +5,18 @@
             "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}",
+                    "AppointmentID": "${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 -->
                 <#else>
-                "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                </#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>
             "RefDate": {
                "DateTime": "${ref_datetime}",

RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl

@@ -5,13 +5,17 @@
         "Header":{
           "ProjectID": "${projectRP}"
         },
+		<#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}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+			<#else>
+				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+			</#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.year_number}-${carrier_apt.appointment_number}",
-				"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>
 		<#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",
@@ -90,7 +95,26 @@
 			</#list>
 			],
 	<#else>
-		<#stop>
+		"Commissions": [
+			{
+				"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+				"ProjectID": "${projectRP}",
+				<#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
+			}
+		],
+		<#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-->

RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl

@@ -4,13 +4,17 @@
         "Header":{
           "ProjectID": "${projectRP}"
         },
+		<#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}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+			<#else>
+				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+			</#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.year_number}-${carrier_apt.appointment_number}",
-				"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)}",

RFXtoRP_RestResponse.ftl

@@ -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,10 +411,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>
@@ -422,6 +422,8 @@
 			<#-- *********************************************** ApiRestID = appointment_post_physical_receipt_associations ******************** -->
 	<#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>

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}"
+    }
+
+  }
+]

RPtoRFX_AppointmentEvent.ftl

@@ -26,8 +26,8 @@
 <#-- *********************************************** Action = CommissionsUpdated ******************** -->
 	<#case "CommissionsUpdated">
 		<#assign appointment = eventRP.data />
-		[
+		[	<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
-			<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as commission>
+				<#if eventRP.addedCommissions?? && eventRP.addedCommissions!="">
 					<#if eventRP.appointmentCustomFields?has_content>
 						{
 							<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
@@ -43,8 +43,27 @@
 							<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
 						}
 					</#if>
-			<#sep>,</#sep>
+				</#if>
-			</#list>
+				<#if eventRP.removedCommissions?? && eventRP.removedCommissions!="">
+					<#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>
+				<#stop "Unsupported Appointment Type for Commissions Update">
+			</#if>
 		]
 	<#break>
 <#-- *********************************************** Action = SlotUpdated ******************** -->

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": {

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": {

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": ""

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,14 +56,10 @@
 				</#if>
 			<#else>
 				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
-					<#if appointment.Commissions[0].OrderID ?? && appointment.Commissions[0].OrderID!="">
-						"appointment_designation":"LOADING",
-					<#else>
 						"appointment_designation":"${(appointment.Reason!"")?json_string}",
 				</#if>
 			</#if>
 		</#if>
-		</#if>
 		"constant_appointment": "false"
 	 }
  }

RPtoRFX_CarrierAppointmentDefaultData.ftl

@@ -2,8 +2,15 @@
 <#-- Note : you can use Order Line Segmentation keys, using the define map : SegmentationKeys_Map  -->
 
 <#-- How to use MD or SK map
-    Example :
+    <#if appointment.CarrierInformation??>
-    <#assign owner_code = SegmentationKeys_Map["Owner"].String!""/>
+        <#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

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??>
+		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
-			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
 		"physical_receipt_list": [
+		<#list eventRP.addedCommissions as addedCommission>
 		{
-					"receipt_activity": "${commission.value.activity_code?json_string}",
+			"receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}",
-					"originator_code": "${commission.value.originator_code?json_string}",
+			"originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}",
-					"physical_receipt_reference": "${commission.value.reference?json_string}",
+			"physical_receipt_reference": "${executionflowCustomFields[addedCommission.ExecutionflowID].reference?json_string}",
-					"receipt_year": "${commission.value.order_year?json_string}",
+			"receipt_year": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_year?json_string}",
-					"receipt_number": "${commission.value.order_number?json_string}"
+			"receipt_number": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_number?json_string}"
 		}
+		<#sep>,</#sep>
+		</#list>
 		]
-			<#else>
-				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
-					"appointment_designation":"${appointment.Reason!""?json_string}"
-				</#if>
-			</#if>
-		</#if>
 	 }
  }

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??>
+		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
-			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
 		"physical_receipt_list": [
+		<#list eventRP.addedCommissions as addedCommission>
 		{
-					"receipt_activity": "${commission.value.activity_code?json_string}",
+			"receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}",
-					"originator_code": "${commission.value.originator_code?json_string}",
+			"originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}",
-					"physical_receipt_reference": "${commission.value.reference?json_string}",
+			"physical_receipt_reference": "${executionflowCustomFields[addedCommission.ExecutionflowID].reference?json_string}",
-					"receipt_year": "${commission.value.order_year?json_string}",
+			"receipt_year": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_year?json_string}",
-					"receipt_number": "${commission.value.order_number?json_string}"
+			"receipt_number": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_number?json_string}"
 		}
+		<#sep>,</#sep>
+		</#list>
 		]
-			<#else>
-				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
-					"appointment_designation":"${appointment.Reason!""?json_string}"
-				</#if>
-			</#if>
-		</#if>
 	 }
  }

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>
+		]
+	 }
+ }

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>
+		]
+	 }
+ }

RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.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": {

RPtoRFX_CarrierAppointmentSlotUpdatedByRef.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": {