Release 2.0.22+2

Merge branch 'release-2.0-SCPN1-10519' into 'release/2.0'
release-2.0-SCPN1-10519 into release/2.0 See merge request r-d-technique/tiers/reflex-wms-connector!270
2026-04-24 11:13:27 +02:00 · 2026-04-24 09:05:19 +00:00 · 2026-04-24 09:50:35 +02:00 · 2026-04-24 09:41:03 +02:00 · 2026-04-23 18:33:12 +02:00 · 2026-04-22 09:42:32 +02:00
35 changed files with 777 additions and 257 deletions
--- a/InternalSettings.ftl
+++ b/InternalSettings.ftl
@@ -0,0 +1,11 @@
+
+<#-- --------------------------------------------------------------------------------------- -->
+<#-- DeleteEF est un paramètre qui permet de déterminer si l’exécution logistique doit être supprimée lors de la création d’une commande.-->
+<#-- Attention : si vous choisissez de la supprimer, toutes les métadonnées associées à cette exécution logistique seront également supprimées.      -->
+<#-- Si DeleteEF_False = true, nous ne supprimons pas l'exécution logistique, Si DeleteEF_False = false, nous supprimons l'exécution logistique.-->
+<#-- --------------------------------------------------------------------------------------- -->
+<#-- DeleteEF is a parameter used to determine whether the logistics execution should be deleted when creating an order.-->
+<#-- Warning: if deletion is selected, all metadata related to the logistics execution will also be removed.   -->
+<#-- If DeleteEF_False = true, we do not delete the logistics execution. If DeleteEF_False = false, we delete the logistics execution. -->
+<#-- --------------------------------------------------------------------------------------- -->
+<#assign DeleteEF_False = true>
--- a/RFXtoRP_Receipt_ExecutionflowDeleted.ftl
+++ b/RFXtoRP_Receipt_ExecutionflowDeleted.ftl
--- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
+++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
@@ -34,7 +34,7 @@
            "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
            "OrderID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
          <#else>
-            <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
+            <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="" && !reflexMvtStockInterface.receipt_reference?starts_with(reflexMvtStockInterface.original_receipt_physical_depot_code + reflexMvtStockInterface.activity_code + reflexMvtStockInterface.receipt_year_number)>
              "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_reference?trim?json_string}",
              "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
            <#else>
--- a/RFXtoRP_HsaItm_ItemCreated.ftl
+++ b/RFXtoRP_HsaItm_ItemCreated.ftl
@@ -29,8 +29,8 @@
        "PhotoURI": "${item.saved_picture_path?json_string}"
        <#else>
          <#if item.url?? && item.url!="" && item.url?starts_with("http") == true>
-      ,
-        "PhotoURI": "${item.url?json_string}"
+          ,
+          "PhotoURI": "${item.url?json_string}"
          </#if>
      </#if>

--- a/RFXtoRP_HsrAntRec.ftl
+++ b/RFXtoRP_HsrAntRec.ftl
@@ -0,0 +1,50 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#switch cloudEventMsg.action>
+    <#case "C">
+        <#-- *********************************************** Action = CREATE ******************** -->
+
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign ancReceipt = JsonUtil.jsonToMap(dataRfx)>
+         [
+          {
+          <#stop >
+         }
+         ]
+        <#break>
+    <#case "U">
+       <#-- *********************************************** Action = UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign ancReceipt = JsonUtil.jsonToMap(dataRfx)>
+         [
+          {
+            <#stop >
+          }
+         ]
+         <#break>
+
+      <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign ancReceipt = JsonUtil.jsonToMap(dataRfx)>
+       [
+            {
+              <#stop >
+            }
+       ]
+         <#break>
+
+
+    <#default>
+          <#stop >
+</#switch>
+
--- a/RFXtoRP_HsrCarrierApt.ftl
+++ b/RFXtoRP_HsrCarrierApt.ftl
@@ -7,8 +7,9 @@
 <#include "ReflexUtils.ftl">

 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
-<#assign projectRP = project>
-<#assign organisationRP = organisation>
+<#assign projectRP            = project>
+<#assign organisationRP       = organisation>
+<#assign partnerApplicationRP = partnerApplication>

 <#assign aDateTime = .now>

@@ -20,10 +21,16 @@
       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
       [
        {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceBookAppointment>
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.BookingForceBookAppointment>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :
-          <#include "RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl">
+          <#include "RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl">
+        },
+        {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierExpected>
+          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+          "datas" :
+          <#include "RFXtoRP_HsrCarrierApt_CarrierExpected.ftl">
        }
       ]
  <#break>
@@ -41,10 +48,10 @@
      <#if carrier_apt.status?? && (carrier_apt.status.status_code=="999" || carrier_apt.status.status_code=="040" || carrier_apt.status.status_code=="030")>
      [
        {
-        <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteCancelAppointment>
+        <#assign apiReflexPlatformID = ApiReflexPlatformID.BookingForceCancelAppointment>
        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
        "datas" :
-        <#include "RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl">
+        <#include "RFXtoRP_HsrCarrierApt_BookingForceCancelAppointment.ftl">
        }
      ]
      <#else>
@@ -85,6 +92,12 @@
 			            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					        "datas" :
 				          <#include "RFXtoRP_HsrCarrierApt_LoadingStarted.ftl">
+                },
+                {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierExpected>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+					        "datas" :
+				          <#include "RFXtoRP_HsrCarrierApt_CarrierExpected.ftl">
                }
              ]
              <#else>
@@ -110,12 +123,12 @@
                  <#else>
                      [
                        {
-                        <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteWMSUpdateAppointment>
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.BookingWMSUpdateAppointment>
                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                        "datas" :
-                        <#include "RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl">
+                        <#include "RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl">
                        }
-                      ]
+                    ]
                  </#if>
                </#if>
              </#if>
@@ -130,10 +143,10 @@
       [

        {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteCancelAppointment>
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.BookingForceCancelAppointment>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :
-          <#include "RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl">
+          <#include "RFXtoRP_HsrCarrierApt_BookingForceCancelAppointment.ftl">
        }
       ]
         <#break>
--- a/RFXtoRP_HsrCarrierApt_AppointmentCarrierInformationUpdatedToConfigure.ftl
+++ b/RFXtoRP_HsrCarrierApt_AppointmentCarrierInformationUpdatedToConfigure.ftl
@@ -7,20 +7,20 @@
    "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}",
+				"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}",
+				"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}",
+				"RefID": "${carrier_apt.appointment_reference?json_string}"
 			<#else>
-				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}"
 			</#if>
 		</#if>
-    }
+    },
    "Payload": {
-    "ActorID": "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+     "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
    <#--To configure-->
 <#--    "CarrierInformation": [
        {
--- a/RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl
+++ b/RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl
@@ -50,8 +50,8 @@
 			{
 			"Key": "unloading",
 			"Value": "${carrier_apt.unloading_appointment?json_string}"
-            }
-            ]
+			}
+        ]
        },
        "Payload":{
            "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}"
--- a/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl
+++ b/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl
@@ -7,20 +7,20 @@
    "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}",
+				"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}",
+				"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}",
+				"RefID": "${carrier_apt.appointment_reference?json_string}"
 			<#else>
-				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}"
 			</#if>
 		</#if>
-    }
+    },
    "Payload": {
-    "ActorID": "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+    "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
    <#--To configure-->
 <#--    "MetaData": [
        {
--- a/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
@@ -0,0 +1,192 @@
+[
+	<#assign creation_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.creation_datetime,time_zone_rfx) />
+    {
+        "Header":{
+          "ProjectID": "${projectRP}:${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}"
+        },
+		"ID":{
+		    "RefDate": {
+				"DateTime": "${creation_datetime}",
+				"AuthorTimeZone": "${time_zone_rfx}"
+			  },
+		<#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>
+		"CustomFields": [
+			{
+			"Key": "depot",
+			"Value": "${carrier_apt.physical_depot?json_string}"
+			},
+			{
+			"Key": "year",
+			"Value": "${carrier_apt.year_number?json_string}"
+			},
+			{
+			"Key": "number",
+			"Value": "${carrier_apt.appointment_number?json_string}"
+			},
+			{
+			"Key": "reference",
+			"Value": "${carrier_apt.appointment_reference?json_string}"
+			},
+			{
+			"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}"
+			}
+		]
+		},
+		"Payload": {
+			"TimeZone":"${time_zone_rfx}",
+			<#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" >
+				<#else>
+					<#if (duration == 0)>
+					   <#assign duration = 1 />
+					</#if>
+				</#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_load_start_datetime or planned_load_end_datetime field of appointmend are not valid" >
+					<#else>
+						<#if (duration == 0)>
+						<#assign duration = 1 />
+						</#if>
+					</#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" >
+						<#else>
+							<#if (duration == 0)>
+							<#assign duration = 1 />
+							</#if>
+						</#if>
+					<#else>
+						<#stop "Appointment type not supported" >
+					</#if>
+				</#if>
+			</#if>
+			"AppointmentType": "${appointmentType}",
+			"Emails": ["${carrier_apt.creation_user_email?json_string}"],
+
+			<#include "RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl">,
+			<#include "RFXtoRP_HsrCarrierApt_CarrierInformation.ftl">,
+			<#include "RFXtoRP_HsrCarrierApt_MetadataAppointment.ftl">,
+			<#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0)>
+				"Unloading" :
+					{
+						"Projects" : [{
+							"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}",
+										<#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}",
+										</#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}",
+										"PartnerAppID": "${partnerApplicationRP}",
+										"OrganisationID": "${organisationRP}"
+									}<#sep>,</#sep>
+									</#list>
+								],
+							    "ProjectID"	: "${projectRP}"
+					   }]
+					},
+			<#else>
+				<#if appointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>
+					"Unloading" :
+				<#else>
+					"Loading" :
+				</#if>
+					{
+						"Projects" : [{
+							"Commissions": [{
+								"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+								"ProjectID": "${projectRP}",
+								"PartnerAppID": "${partnerApplicationRP}",
+								"OrganisationID": "${organisationRP}"
+						}],
+							"ProjectID"	: "${projectRP}"
+					}]
+					},
+				<#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>
+			"Slot": {
+				<#-- 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}"
+						<#else>
+							<#stop "Appointment type not supported" >
+						</#if>
+					</#if>
+				</#if>
+			}
+		}
+	}
+]
--- a/RFXtoRP_HsrCarrierApt_BookingForceCancelAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_BookingForceCancelAppointment.ftl
@@ -0,0 +1,58 @@
+<#assign update_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.last_update_datetime,time_zone_rfx) />
+[
+  {
+	"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>
+		"RefDate": {
+			"DateTime": "${update_datetime}",
+			"AuthorTimeZone": "${time_zone_rfx}"
+		},
+		"CustomFields": [
+			{
+			"Key": "depot",
+			"Value": "${carrier_apt.physical_depot?json_string}"
+			},
+			{
+			"Key": "year",
+			"Value": "${carrier_apt.year_number?json_string}"
+			},
+			{
+			"Key": "number",
+			"Value": "${carrier_apt.appointment_number?json_string}"
+			},
+			{
+			"Key": "reference",
+			"Value": "${carrier_apt.appointment_reference?json_string}"
+			},
+			{
+			"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}"
+			}
+		]
+	
+		},
+    "Header": {
+      "ProjectID": "${projectRP}:${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}"
+    }
+  }
+]
--- a/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
@@ -1,61 +1,29 @@
 [
    {
+		<#assign update_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.last_update_datetime,time_zone_rfx) />
+
        "Header":{
-          "ProjectID": "${projectRP}"
+          "ProjectID": "${projectRP}:${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}"
        },
-		"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+		"ID":{
+		     "RefDate": {
+				"DateTime": "${update_datetime}",
+				"AuthorTimeZone": "${time_zone_rfx}"
+			  },
 		<#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}",
+				"RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			<#else>
-				"AppointmentID": "${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!="">
-				"AppointmentID": "${carrier_apt.appointment_reference?json_string}",
+				"RefID": "${carrier_apt.appointment_reference?json_string}",
 			<#else>
-				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			</#if>
 		</#if>
-		"TimeZone":"${time_zone_rfx}",
-		 <#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 />
-				</#if>
-			</#if>
-		</#if>
-		"AppointmentType": "${appointmentType}",
-		"Emails": ["${carrier_apt.creation_user_email?json_string}"],
-		 "CustomFields": [
+			"CustomFields": [
 			{
 			"Key": "depot",
 			"Value": "${carrier_apt.physical_depot?json_string}"
@@ -84,34 +52,105 @@
 			"Key": "unloading",
 			"Value": "${carrier_apt.unloading_appointment?json_string}"
 			}
-		],
-		<#include "RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl">,
-		<#include "RFXtoRP_HsrCarrierApt_CarrierInformation.ftl">,
-		<#include "RFXtoRP_HsrCarrierApt_MetadataAppointment.ftl">,
-		<#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0)>
-        	"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}",
-					<#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}",
-					</#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>
-				</#list>
-			],
+		]
+		},
+		"Payload": {
+		<#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>
-		    "Commissions": [
+			<#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>
+					<#stop "Appointment type not supported" >
+				</#if>
+			</#if>
+		</#if>
+		"TimeZone":"${time_zone_rfx}",
+		<#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"))>
+		"Unloading" :
+			{
+				"Projects" : [
 				{
-					"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-					"ProjectID": "${projectRP}",
-                    <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
-				}
-			],
+					"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}",
+						<#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}",
+						</#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}",
+						"PartnerAppID": "${partnerApplicationRP}",
+						"OrganisationID": "${organisationRP}"
+					}<#sep>,</#sep>
+					</#list>
+					],
+					"ProjectID"	: "${projectRP}"
+				}]
+			},
+		"Reason": "",	
+		<#else>
+		    <#if appointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>
+			"Loading" :
+			{
+				"Projects" : [
+				{
+					"Commissions": [
+					{
+						"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+						"ProjectID": "${projectRP}",
+						"PartnerAppID": "${partnerApplicationRP}",
+						"OrganisationID": "${organisationRP}"
+					}
+					],
+					"ProjectID"	: "${projectRP}"
+				}]
+			},
+			<#else>
+				<#if appointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>
+				"Unloading" :
+					{
+						"Projects" : [
+						{
+							"Commissions": [
+							{
+								"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+								"ProjectID": "${projectRP}",
+								"PartnerAppID": "${partnerApplicationRP}",
+								"OrganisationID": "${organisationRP}"
+							}
+							],
+							"ProjectID"	: "${projectRP}"
+						}]
+					},
+				</#if>
+			</#if>
 			<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
 				"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
 			<#else>
@@ -126,9 +165,9 @@
 				</#if>
 			</#if>
 		</#if>
-		"Slots": [{
+	"Slot": {
 			<#-- calcul de de la durée en fonction des start et end time-->
-			    "DurationInSeconds": "${duration}",
+			"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" >
@@ -151,6 +190,7 @@
 					</#if>
 				</#if>
 			</#if>
-		}]
-    }
+		    }
+		}
+	}
 ]
--- a/RFXtoRP_HsrCarrierApt_CarrierExpected.ftl
+++ b/RFXtoRP_HsrCarrierApt_CarrierExpected.ftl
@@ -0,0 +1,31 @@
+[
+    <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.creation_datetime,time_zone_rfx) />
+    <#assign ref_datetime2 = AddSecondsToDatetime(ref_datetime?datetime.iso, 60)?iso_utc />
+    {
+        "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>
+            "RefDate": {
+               "DateTime": "${ref_datetime2}",
+               "AuthorTimeZone": "${time_zone_rfx}"
+			 }
+        },
+        "Payload":{
+            "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}"
+        }
+    }
+]
--- a/RFXtoRP_HsrCarrierApt_Quantities.ftl
+++ b/RFXtoRP_HsrCarrierApt_Quantities.ftl
@@ -1,5 +0,0 @@
-"Quantities": [
-   
- ]
-
-
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -79,6 +79,7 @@
              <#else>
                "Actor":
                {
+				  <#include "RFXtoRP_HsrPro_ExecutionflowDetected_ShipToMetadata.ftl">,
                  "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}",
                  "Address" :
                    {
--- a/RFXtoRP_HsrPro_ExecutionflowDetected_ShipToMetadata.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected_ShipToMetadata.ftl
@@ -0,0 +1,10 @@
+<#-- use protobuf of class HsrPro to find HARDIS WMS fields names  -->
+
+<#-- Best practices:
+  If the SK is of type:
+  - string: add ?json_string (e.g. "${stock.batch_1?json_string}")
+  - boolean: possible values: true and false
+  - datetime: expected format: 2025-10-30T10:12:10.000Z
+  - decimal number: the separator is a point (e.g. 10.5)-->
+
+"MetaData": [        ]
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -15,7 +15,7 @@

      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
-        <#if receipt.receipt_type?? && receipt.receipt_type = "030" && receipt.line_list??> <#-- if reception is a transfer type -->
+        <#if receipt.receipt_type?? && receipt.receipt_type = "030" && receipt.line_list?? && receipt.line_list[0]?? > <#-- if reception is a transfer type -->
          [
            {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
@@ -38,7 +38,7 @@
            }
          ]
        <#else>
-          <#if receipt.line_list ??>
+          <#if receipt.line_list ?? && receipt.line_list[0]??>
          [
            {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
@@ -79,12 +79,40 @@
            }
          <#else>
            <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "true">
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
-            }
+              <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" && receipt.receipt_reference?? && receipt.receipt_reference!="">
+                <#assign ID = "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}"/>
+              <#else>
+                <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+                  <#assign ID = "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}"/>
+                <#else>
+                  <#assign ID = "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}"/>
+                </#if>
+              </#if>
+              <#assign payload = '{"Header": {"ProjectID": "${projectRP!""}"},"IDs": [{"RefID": "${ID}"}]}' />
+              <#assign queryApiReflexPlatformID = QueryApiReflexPlatformID.OrderGetByIds>
+              <#assign response = QueryApiReflexPlatformCall.call(queryApiReflexPlatformID,payload) />
+              <#assign orderRP = JsonUtil.jsonToMap(response)>
+              <#if orderRP?? && orderRP.Objects?? && orderRP.Objects[0]?? && orderRP.Objects[0].ID.RefID?? >
+                {
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                "datas" :
+                <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
+                }
+              <#else>
+                {
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                "datas" :
+                <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
+                },
+                {
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                "datas" :
+                <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
+                }
+              </#if>
            <#else>
              <#if receipt.receipt_confirmed?? && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
                {
@@ -95,14 +123,34 @@
                }
              <#else>
                <#if receipt.receipt_confirmed ?? && receipt.receipt_confirmed == "true" >
-                  {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :
-                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
-                  }
+                  <#assign ID = "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}"/>
+                  <#assign payload = '{"Header": {"ProjectID": "${projectRP!""}"},"IDs": [{"RefID": "${ID}"}]}'/>
+                  <#assign queryApiReflexPlatformID = QueryApiReflexPlatformID.OrderGetByIds>
+                  <#assign response = QueryApiReflexPlatformCall.call(queryApiReflexPlatformID,payload) />
+                  <#assign orderRP = JsonUtil.jsonToMap(response)>
+                  <#if orderRP?? && orderRP.Objects?? && orderRP.Objects[0]?? && orderRP.Objects[0].ID.RefID?? >
+                    {
+                      <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+                      "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                      "datas" :
+                      <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+                    }
+                  <#else>
+                    {
+                      <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                      "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                      "datas" :
+                      <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+                    },
+                    {
+                      <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+                      "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                      "datas" :
+                      <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+                    }
+                  </#if>
                <#else>
-                  <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "false" && receipt.line_list??>
+                  <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "false" && receipt.line_list?? && receipt.line_list[0]??>
                    <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
                    [
                      {
@@ -110,21 +158,19 @@
                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                        "datas" :
                        <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
-
                      },
                      {
                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                        "datas" :
                        <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
-
                      }
                    ]
                    <#else>
                      <#stop> <#-- Receipt reference for transfer is empty-->
                    </#if>
                  <#else>
-                    <#if receipt.line_list ??>
+                    <#if receipt.line_list ?? && receipt.line_list[0]??>
                      {
                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
@@ -7,11 +7,15 @@
    {
      "Header": {"ProjectID": "${projectRP}"},
      "ID": {
-        <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-          "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-        <#else>
-          "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-        </#if>
+         <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" && receipt.receipt_reference?? && receipt.receipt_reference!="">
+            "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+          <#else>
+            <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+              "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+            <#else>
+              "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+            </#if>
+          </#if>
        "RefDate": {
          "DateTime": "${receipt_status_datetime}",
          "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
@@ -39,10 +39,14 @@
                "Value": "${receipt.receipt_number}"
            }
        ],
-          <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+          <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" && receipt.receipt_reference?? && receipt.receipt_reference!="">
            "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
          <#else>
-            "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+            <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+              "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+            <#else>
+              "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+            </#if>
          </#if>
        "RefDate": {
              "DateTime": "${receipt_creation_datetime}",
@@ -54,11 +58,11 @@
          "DateTime": "${receipt_creation_datetime}",
          "AuthorTimeZone": "${time_zone_rfx}"
          },
-        <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-          "OrderID": "${receipt.receipt_reference?trim?json_string}",
-        <#else>
-          "OrderID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
-        </#if>
+          <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+            "OrderID": "${receipt.receipt_reference?trim?json_string}",
+          <#else>
+            "OrderID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+          </#if>
        <#-- Header Metadata inclusion -->
        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
        "ShipFrom":
@@ -233,7 +237,7 @@
                    "DateTime": "${receipt_creation_datetime}",
                    "AuthorTimeZone": "${time_zone_rfx}"
                    },
-                  "OrderID":"${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
+                  "OrderID":"R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
                <#-- Header Metadata inclusion -->
                <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
                "ShipFrom":
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
@@ -7,11 +7,15 @@
    {
      "Header": {"ProjectID": "${projectRP}"},
      "ID": {
-       <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-          "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-        <#else>
-          "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-        </#if>
+        <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" && receipt.receipt_reference?? && receipt.receipt_reference!="">
+            "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+          <#else>
+            <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+              "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+            <#else>
+              "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+            </#if>
+          </#if>
        "RefDate": {
          "DateTime": "${receipt_status_datetime}",
          "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
@@ -7,11 +7,15 @@
    {
      "Header": {"ProjectID": "${projectRP}"},
      "ID": {
-        <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-          "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-        <#else>
-          "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-        </#if>
+         <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" && receipt.receipt_reference?? && receipt.receipt_reference!="">
+            "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+          <#else>
+            <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+              "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+            <#else>
+              "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+            </#if>
+          </#if>
        "RefDate": {
          "DateTime": "${receipt_status_datetime}",
          "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_RestResponse.ftl
+++ b/RFXtoRP_RestResponse.ftl
@@ -8,11 +8,13 @@
 <#assign projectRP = project>
 <#assign organisationRP = organisation>

-
 <#assign aDateTime = .now>
 <#assign no_apiRestReflexID = "no apiRestReflexID">
 <#assign no_status = -99999>
 <#assign event = "UNKNOW_EVENT" >
+<#-- DeleteEF_False a définir dans ce fichier -->
+<#-- DeleteEF_False to be defined in this file.-->
+<#include "InternalSettings.ftl">

 <#switch id.apiRestReflexID!no_apiRestReflexID>
 	<#case no_apiRestReflexID>
@@ -59,17 +61,8 @@
 			<#case 201>
 				<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
 				<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)>
-				<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" >
-				[
-					{
-						<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
-						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						"datas" :
-						<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
-					}
-				]
-				<#else>
-					<#if preparationOrderPostResponse.status?? &&  preparationOrderPostResponse.status == "WARN">
+				<#if preparationOrderPostResponse.status?? && (preparationOrderPostResponse.status == "SUCCESS" || preparationOrderPostResponse.status == "WARN")  >
+					<#if DeleteEF_False>
 					[
 						{
 							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
@@ -81,21 +74,30 @@
 					<#else>
 					[
 						{
-							<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-							<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
-							"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-							"datas" :
-							    <#assign event = "RP_EXECUTIONFLOW_EVENT">
-								<#include "RFXtoRP_PlatformLogCreate.ftl">
-						},
-						{
-							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
-							"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-							"datas" :
-								<#include "RFXtoRP_RestResponseAllocationError.ftl">
+							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
+													"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+													"datas" :
+							<#include "RFXtoRP_ExecutionflowDeleted.ftl">
 						}
 					]
 					</#if>
+				<#else>
+				[
+					{
+						<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
+						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						"datas" :
+							<#assign event = "RP_EXECUTIONFLOW_EVENT">
+							<#include "RFXtoRP_PlatformLogCreate.ftl">
+					},
+					{
+						<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						"datas" :
+							<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					}
+				]
 				</#if>
 			<#break>
 			<#default>
@@ -154,9 +156,9 @@
 				[
 					{
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
-												"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-												"datas" :
-						<#include "RFXtoRP_Receipt_ExecutionflowDeleted.ftl">
+						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						"datas" :
+						<#include "RFXtoRP_ExecutionflowDeleted.ftl">
 					}
 				]
 				<#else>
--- a/RPtoRFX_AppointmentEvent.ftl
+++ b/RPtoRFX_AppointmentEvent.ftl
@@ -28,28 +28,36 @@
 	    <#assign AddComma = false />
 		<#assign appointment = eventRP.data />
 	[
-		<#if eventRP.commissionsUpdated>
-			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.addedCommissions?? && eventRP.addedCommissions != "">
+		<#if appointment?? && (!(appointment.WMSCreated??) ||  !appointment.WMSCreated) &&  appointment.Status?? && appointment.Status.Current?? && appointment.Status.Current.StatusCode?? && appointment.Status.Current.StatusCode == AppointmentStatusCode.APPOINTMENT_0150_ALLOCATION_ERROR>
+		{
+			<#assign apiRestReflexID = ApiRestReflexID.appointment_post_create>
+			"apiRestReflexID" :  "${apiRestReflexID}",
+			"datas" :
+			<#include "RPtoRFX_CarrierAppointmentCreated.ftl">
+		}
+		<#else>
+			<#if eventRP.commissionsUpdated>
+				<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.addedUnloadCommissions?? && eventRP.addedUnloadCommissions != "">
 					<#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">
-						}
+					{
+						<#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>
-				<#assign AddComma = true />
+					<#assign AddComma = true />
 				</#if>
-			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.removedCommissions?? && eventRP.removedCommissions!="">
-				<#if AddComma == true>
-					   ,
+				<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.removedUnloadCommissions?? && eventRP.removedUnloadCommissions!="">
+					<#if AddComma == true>
+						,
 					</#if>

 					<#if eventRP.appointmentCustomFields?has_content>
@@ -67,32 +75,33 @@
 						<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl">
 					}
 					</#if>
+					<#assign AddComma = true />
+				</#if>
+			</#if>	
+	<#-- *********************************************** Action = reasonUpdated or slotUpdated ******************** -->
+			<#if eventRP.reasonUpdated   || eventRP.slotUpdated  || eventRP.carrierInformationUpdated>
+				<#if AddComma == true>
+					,
+				</#if>
+				<#if eventRP.appointmentCustomFields?has_content>
+				{
+					<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_number>
+					"apiRestReflexID" :  "${apiRestReflexID}",
+					"datas" :
+					<#include "RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl">
+				}
+				<#else>
+				{
+					<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_ref>
+					"apiRestReflexID" :  "${apiRestReflexID}",
+					"datas" :
+					<#include "RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl">
+				}
+				</#if>
 				<#assign AddComma = true />
-				</#if>
-				</#if>
-<#-- *********************************************** Action = reasonUpdated or slotUpdated ******************** -->
-		<#if eventRP.reasonUpdated   || eventRP.slotUpdated  || eventRP.carrierInformationUpdated>
-			<#if AddComma == true>
-				,
 			</#if>
-			<#if eventRP.appointmentCustomFields?has_content>
-			{
-				<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_number>
-				"apiRestReflexID" :  "${apiRestReflexID}",
-				"datas" :
-				<#include "RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl">
-			}
-			<#else>
-			{
-				<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_ref>
-				"apiRestReflexID" :  "${apiRestReflexID}",
-				"datas" :
-				<#include "RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl">
-			}
-			</#if>
-			<#assign AddComma = true />
-        </#if>
-		]
+	    </#if>	
+	]
 	<#break>
 <#-- *********************************************** Action = Canceled ******************** -->
 	<#case "Canceled">
--- a/RPtoRFX_CarrierAppointmentCreated.ftl
+++ b/RPtoRFX_CarrierAppointmentCreated.ftl
@@ -9,7 +9,7 @@
 	 {
 	   "appointment_reference": "${eventRP.refid?json_string}",
       <#switch appointment.AppointmentType>
-	       <#case "APPOINTMENT_TYPE_LOADING">
+	       <#case AppointmentType.APPOINTMENT_TYPE_LOADING>
 			   "unloading_appointment" : "false",
 			   "load_appointment" : "true",
               <#if appointment.TimeZone?? && appointment.TimeZone!="">
@@ -20,7 +20,7 @@
 					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
 				</#if>
 			<#break>
-		   <#case  "APPOINTMENT_TYPE_UNLOADING">
+		   <#case  AppointmentType.APPOINTMENT_TYPE_UNLOADING>
 		       "unloading_appointment" : "true",
 			   "load_appointment" : "false",
 			   <#if appointment.TimeZone?? && appointment.TimeZone!="">
@@ -35,29 +35,31 @@
 	         <#stop "appointment.AppointmentType not implemented" >
        </#switch>
 		<#include "RPtoRFX_CarrierAppointmentDefaultData.ftl">
-		<#if appointment.Commissions??>
-			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
-				<#if appointment.Commissions[0].OrderID?? && appointment.Commissions[0].OrderID!="">
-					"physical_receipt_list": [
-					<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom>
+		<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING >
+			<#if appointment.Unloading?? && appointment.Unloading.Projects?? && appointment.Unloading.Projects[0]?? &&
+				appointment.Unloading.Projects[0].Commissions?? &&
+				appointment.Unloading.Projects[0].Commissions[0]?? && appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID?? && appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID!="" >
+				"physical_receipt_list": [
+				<#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.ExecutionflowID?? && l.ExecutionflowID !="") as commission>
+					<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.key == commission.ExecutionflowID && l.value?? && l.value?has_content) as custom>
 					{
 						"receipt_activity": "${custom.value.activity_code?json_string}",
 						"originator_code": "${custom.value.originator_code?json_string}",
 						"physical_receipt_reference": "${custom.value.reference?json_string}",
 						"receipt_year": "${custom.value.order_year?json_string}",
 						"receipt_number": "${custom.value.order_number?json_string}"
-
 					}
 					<#sep>,</#sep>
 					</#list>
-					],
-				<#else>
-					"appointment_designation":"${(appointment.Reason!"")!?json_string}",
-				</#if>
+					<#sep>,</#sep>
+					</#list>
+				],
 			<#else>
-				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
-						"appointment_designation":"${(appointment.Reason!"")?json_string}",
-				</#if>
+				"appointment_designation":"${(appointment.Reason!"")!?json_string}",
+			</#if>
+		<#else>
+			<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>
+				"appointment_designation":"${(appointment.Reason!"")?json_string}",
 			</#if>
 		</#if>
 		"constant_appointment": "false"
--- a/RPtoRFX_CarrierAppointmentDefaultData.ftl
+++ b/RPtoRFX_CarrierAppointmentDefaultData.ftl
@@ -19,3 +19,23 @@
        Int : .Int
        String : .String
 -->
+
+<#-- Note : you can send url path of appointment to WMS, using this below code  -->
+
+<#-- 
+	<#assign appointmentPathURL = JsonUtil.getAppointmentPathURL(eventRP.site,eventRP.refid)>
+    <#assign payLoad = '{ "Header": {"ProjectID": "${projectRP!""}"},"IsOnce": false,"IsPublic": true,"TimeToLive": "0","URL": "${appointmentPathURL}"}' />
+    <#assign projectGetTinyURL = QueryApiReflexPlatformID.ProjectGetTinyURL>
+	<#assign response = QueryApiReflexPlatformCall.call(projectGetTinyURL,payLoad) />
+    <#assign tinyURL = JsonUtil.jsonToMap(response)>
+
+    <#if tinyURL?? && tinyURL.TinyURL?? >
+		"comment_list": [
+			{
+			"line_number": 1,
+			"group_code": "SCN",
+			"text": "${tinyURL.TinyURL.URL?json_string}"
+			}
+		    ],
+		</#if>
+-->        
--- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl
+++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl
@@ -10,8 +10,14 @@
 	"payload" :
 	 {
 		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
+		<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>	
+		<#assign addedCommissions = eventRP.addedUnloadCommissions />
+		<#else>
+		<#assign addedCommissions = eventRP.addedLoadCommissions />
+		</#if>
+
 		"physical_receipt_list": [
-		<#list eventRP.addedCommissions as addedCommission>
+		<#list addedCommissions?filter(l -> l.ExecutionflowID??) as addedCommission>
 		{
 			"receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}",
 			"originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}",
--- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl
+++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl
@@ -9,8 +9,14 @@
 	"payload" :
 	 {
 		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
+		<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>	
+		<#assign addedCommissions = eventRP.addedUnloadCommissions />
+		<#else>
+		<#assign addedCommissions = eventRP.addedLoadCommissions />
+		</#if>
+
 		"physical_receipt_list": [
-		<#list eventRP.addedCommissions as addedCommission>
+		<#list addedCommissions?filter(l -> l.ExecutionflowID??) as addedCommission>
 		{
 			"receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}",
 			"originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}",
--- a/RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByNumber.ftl
+++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByNumber.ftl
@@ -10,8 +10,14 @@
 	"payload" :
 	 {
 		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
+		<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>	
+		<#assign removedCommissions = eventRP.removedUnloadCommissions />
+		<#else>
+		<#assign removedCommissions = eventRP.removedLoadCommissions />
+		</#if>
+
 		"physical_receipt_list": [
-		<#list eventRP.removedCommissions as removedCommission>
+		<#list removedCommissions?filter(l -> l.ExecutionflowID??) as removedCommission>
 		{
 			"receipt_activity": "${executionflowCustomFields[removedCommission.ExecutionflowID].activity_code?json_string}",
 			"originator_code": "${executionflowCustomFields[removedCommission.ExecutionflowID].originator_code?json_string}",
--- a/RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl
+++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl
@@ -9,8 +9,14 @@
 	"payload" :
 	 {
 		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
+		<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>	
+		<#assign removedCommissions = eventRP.removedUnloadCommissions />
+		<#else>
+		<#assign removedCommissions = eventRP.removedLoadCommissions />
+		</#if>
+
 		"physical_receipt_list": [
-		<#list eventRP.removedCommissions as removedCommission>
+		<#list removedCommissions?filter(l -> l.ExecutionflowID??) as removedCommission>
 		{
 			"receipt_activity": "${executionflowCustomFields[removedCommission.ExecutionflowID].activity_code?json_string}",
 			"originator_code": "${executionflowCustomFields[removedCommission.ExecutionflowID].originator_code?json_string}",
--- a/RPtoRFX_CarrierAppointmentReasonUpdatedByNumber.ftl
+++ b/RPtoRFX_CarrierAppointmentReasonUpdatedByNumber.ftl
@@ -9,10 +9,10 @@
 	},
 	"payload" :
 	 {
-		"unloading_appointment" : "${eventRP.appointmentCustomFields.unloading?json_string}",
-		"load_appointment" : "${eventRP.appointmentCustomFields.loading?json_string}",
+		"unloading_appointment" : "${eventRP.appointmentCustomFields.unloading!"false"?json_string}",
+		"load_appointment" : "${eventRP.appointmentCustomFields.loading!"false"?json_string}",
 		<#switch appointment.AppointmentType>
-	       <#case "APPOINTMENT_TYPE_LOADING">
+	       <#case AppointmentType.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)}",
@@ -21,7 +21,7 @@
 					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
 				</#if>
 		   <#break>
-		   <#case  "APPOINTMENT_TYPE_UNLOADING">
+		   <#case  AppointmentType.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)}",
--- a/RPtoRFX_CarrierAppointmentReasonUpdatedByRef.ftl
+++ b/RPtoRFX_CarrierAppointmentReasonUpdatedByRef.ftl
@@ -9,7 +9,7 @@
 	"payload" :
 	 {
 		<#switch appointment.AppointmentType>
-	       <#case "APPOINTMENT_TYPE_LOADING">
+	       <#case AppointmentType.APPOINTMENT_TYPE_LOADING>
 		   		"unloading_appointment" : "false",
 				"load_appointment" : "true",
 				<#if appointment.TimeZone?? && appointment.TimeZone!="">
@@ -20,7 +20,7 @@
 					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
 				</#if>
 			<#break>
-		   	<#case  "APPOINTMENT_TYPE_UNLOADING">
+		   	<#case  AppointmentType.APPOINTMENT_TYPE_UNLOADING>
 				"unloading_appointment" : "true",
 				"load_appointment" : "false",
 				<#if appointment.TimeZone?? && appointment.TimeZone!="">
--- a/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl
+++ b/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl
@@ -10,10 +10,10 @@
 	"payload" :
 	 {
 		<#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" : "${eventRP.appointmentCustomFields.unloading!"false"?json_string}",
+		"load_appointment" : "${eventRP.appointmentCustomFields.loading!"false"?json_string}",
+		<#switch appointment.AppointmentType>
+	       <#case AppointmentType.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)}",
@@ -22,7 +22,7 @@
 					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
 				</#if>
 		   <#break>
-		   <#case  "APPOINTMENT_TYPE_UNLOADING">
+		   <#case  AppointmentType.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)}",
--- a/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl
+++ b/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl
@@ -10,7 +10,7 @@
 	 {
 		<#include "RPtoRFX_CarrierAppointmentDataUpdated.ftl">
       <#switch appointment.AppointmentType>
-	       <#case "APPOINTMENT_TYPE_LOADING">
+	       <#case AppointmentType.APPOINTMENT_TYPE_LOADING>
 				"unloading_appointment" : "false",
 				"load_appointment" : "true",
 				<#if appointment.TimeZone?? && appointment.TimeZone!="">
@@ -21,7 +21,7 @@
 					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
 				</#if>
 			<#break>
-		   	<#case  "APPOINTMENT_TYPE_UNLOADING">
+		   	<#case  AppointmentType.APPOINTMENT_TYPE_UNLOADING>
 				"unloading_appointment" : "true",
 				"load_appointment" : "false",
 				<#if appointment.TimeZone?? && appointment.TimeZone!="">
--- a/RPtoRFX_ExecutionflowEvent.ftl
+++ b/RPtoRFX_ExecutionflowEvent.ftl
@@ -29,9 +29,9 @@
 		   [
 		       <#if eventRP.partnerAppRole ==  "ShipFrom" && executionflow.ShipFrom.ActorID != "" && executionflow.ShipFrom.Actor.IsShipFromConnected?? && executionflow.ShipFrom.Actor.IsShipFromConnected>
 			   {
-				 <#assign apiRestReflexID = ApiRestReflexID.preparation_orders_post>
-				 "apiRestReflexID" :  "${apiRestReflexID}",
-				 "datas" :
+					<#assign apiRestReflexID = ApiRestReflexID.preparation_orders_post>
+					"apiRestReflexID" :  "${apiRestReflexID}",
+					"datas" :
 					<#include "RPtoRFX_PrepOrder.ftl">
 			   }
 			   </#if>
--- a/2
+++ b/2
@@ -1 +1 @@
-2.0.20+4
+2.0.22+2
Author	SHA1	Message	Date
Francis Reat	ac18299345	Release 2.0.22+2	2026-04-24 11:13:27 +02:00
Francis Reat	148d0daffd	Merge branch 'release-2.0-SCPN1-10519' into 'release/2.0' release-2.0-SCPN1-10519 into release/2.0 See merge request r-d-technique/tiers/reflex-wms-connector!270	2026-04-24 09:05:19 +00:00
Francis Reat	4e5070a902	Merge branch 'develop' into release-2.0-SCPN1-10519	2026-04-24 09:50:35 +02:00
Francis Reat	2b25c4853d	back SCPN1 10519	2026-04-24 09:41:03 +02:00
Laurie Montant	844ecb1558	back SCPN1-10519	2026-04-23 18:33:12 +02:00
Francis Reat	837b8f86ed	Release 2.0.22+1	2026-04-22 09:42:32 +02:00
Francis Reat	4e7d98144d	Merge branch 'release2.0-SCPN1-10621' into 'release/2.0' SCPN1-10621 into "Release2.0 " See merge request r-d-technique/tiers/reflex-wms-connector!265	2026-04-22 07:20:56 +00:00
Francis Reat	3a061c2374	SCPN1-10586	2026-04-22 08:28:24 +02:00
Francis Reat	ce7104ee9f	Merge branch 'develop' into release2.0-SCPN1-10621	2026-04-21 10:30:44 +02:00
Laurie Montant	846641ac35	SCPN1-10586	2026-04-21 08:34:49 +02:00
Laurie Montant	50771c3268	SCPN1-10586	2026-04-20 16:41:00 +02:00
Laurie Montant	7deb33a7e0	SCPN1-10586	2026-04-20 13:45:27 +02:00
Vincent LE MAÎTRE	d8c87881f5	Release 2.0.21+1	2026-04-20 13:44:13 +02:00
Francis Reat	c9070dd01e	Merge branch 'release-2.0-v13' into 'release/2.0' release-2.0-v13 into release/2.0 See merge request r-d-technique/tiers/reflex-wms-connector!261	2026-04-20 09:43:52 +00:00
Francis Reat	3915c83146	Merge branch 'develop' into release-2.0-v13 # Conflicts: # RFXtoRP_HsaItm_ItemCreated.ftl # RFXtoRP_HsrAntRec.ftl # RFXtoRP_HsrCarrierApt.ftl # RFXtoRP_HsrCarrierApt_AppointmentCarrierInformationUpdatedToConfigure.ftl # RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl # RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl # RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl # RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl # RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl # RFXtoRP_HsrPro_ExecutionflowDetected_ShipToMetadata.ftl # RFXtoRP_PlatformLogCreate.ftl # RFXtoRP_RestResponse.ftl # RPtoRFX_AppointmentEvent.ftl # RPtoRFX_CarrierAppointmentReasonUpdatedByNumber.ftl # RPtoRFX_CarrierAppointmentReasonUpdatedByRef.ftl # RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl	2026-04-20 11:05:59 +02:00
Laurie Montant	bf3f30190d	SCPN1-10586	2026-04-17 17:12:39 +02:00
Laurie Montant	c67ca71693	SCPN1-10586	2026-04-17 15:53:33 +02:00
Laurie Montant	17263f024f	SCPN1-10586	2026-04-17 14:16:56 +02:00
Laurie Montant	e8afce8ef0	Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop	2026-04-17 10:59:38 +02:00
Laurie Montant	e03a017118	SCPN1-10586	2026-04-17 10:59:30 +02:00
Francis Reat	2bfb866dcc	SCPN1-10586	2026-04-16 17:35:48 +02:00
Francis Reat	68f99e1435	SCPN1-10586	2026-04-16 17:23:35 +02:00
Francis Reat	13fe55ae1a	SCPN1-10586	2026-04-16 17:17:35 +02:00
Laurie Montant	4f0874a7dc	SCNP1-10579	2026-04-14 15:06:25 +02:00
Laurie Montant	62984a07f4	SCPN1-10579	2026-04-14 14:54:55 +02:00
Laurie Montant	2008f01f6f	Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop	2026-04-14 14:42:03 +02:00
Laurie Montant	a37d43f50f	SCPN1-10579	2026-04-14 14:41:55 +02:00
Francis Reat	10fa7309fa	SCPN1-10579 (cherry picked from commit `6fac2a7a2c`)	2026-04-14 14:38:24 +02:00
Laurie Montant	8a810c8a14	SCPN1-10586	2026-04-14 14:33:44 +02:00
Francis Reat	8e1d0e3a17	SCPN1-10560	2026-04-13 15:10:17 +02:00
Laurie Montant	e12c6e64e4	Delete Rec_Prev	2026-04-13 10:08:38 +02:00
Laurie Montant	eaaa9bbea5	SCPN1-10534	2026-04-03 17:01:28 +02:00
Laurie Montant	6c0deafd93	SCPN1-10534	2026-04-03 16:54:48 +02:00
Laurie Montant	62cdd584d3	SCPN1-10534	2026-04-03 16:36:54 +02:00
Laurie Montant	97f93a1f26	SCPN1-10534	2026-04-03 16:32:02 +02:00
Laurie Montant	ee7e5bb8c9	SCPN1-10534	2026-04-03 16:22:31 +02:00
Francis Reat	4e3162556c	SCPN1-10402	2026-04-03 14:30:18 +02:00
Laurie Montant	20437cace5	SCPN1-10534	2026-04-02 11:48:30 +02:00
Francis Reat	93effa78ff	SCPN1-10402	2026-03-31 17:57:33 +02:00
Francis Reat	085f0ae4f8	Merge branch 'SCPN1-10402-SCPN1-10471-develop' into 'develop' SCPN1-10471 Closes SCPN1-10402 See merge request r-d-technique/tiers/reflex-wms-connector!259	2026-03-31 06:54:39 +00:00
Francis Reat	3d585203ef	SCPN1-10402	2026-03-31 08:53:18 +02:00
Laurie Montant	57576b1ac0	SCPN1-10443	2026-03-26 14:14:31 +01:00
Laurie Montant	83260c7ac5	SCPN1-10443	2026-03-26 11:37:46 +01:00
Laurie Montant	8ebaa8e15a	https://pid.hardis.fr/jira/browse/SCPN1-10443	2026-03-26 11:28:56 +01:00
Francis Reat	f602f74da1	SCPN1-10471 SCPN1-10402	2026-03-24 17:10:45 +01:00
Francis Reat	37495ca141	SCPN1-9218	2026-03-24 17:07:31 +01:00
Laurie Montant	217a2680de	SCPN1-10443	2026-03-20 13:27:45 +01:00
Laurie Montant	6fd708cf58	SCPN1-10443	2026-03-19 17:28:52 +01:00
Laurie Montant	e5482ad09c	SCPN1-10443	2026-03-19 17:18:31 +01:00
Laurie Montant	33ea0af1b9	SCPN1-10443	2026-03-19 17:10:10 +01:00
Laurie Montant	f7394986c2	SCPN1-10443	2026-03-19 16:57:33 +01:00
Laurie Montant	6ae3af7139	SCPN1-10443	2026-03-19 16:37:35 +01:00
Laurie Montant	c89c74d2e2	SCPN1-10443	2026-03-19 16:26:24 +01:00
Laurie Montant	d02e6feead	SCPN1-10443	2026-03-19 14:35:06 +01:00
Laurie Montant	6ce6ac0b8d	SCPN1-10443	2026-03-19 14:30:00 +01:00
Laurie Montant	647e2d45af	SCPN1-10443	2026-03-19 14:15:15 +01:00
Laurie Montant	f26dda887a	SCPN1-10459	2026-03-19 11:51:15 +01:00
Laurie Montant	9dd59d75f3	SCPN1-10443	2026-03-19 11:34:25 +01:00
Laurie Montant	48be4322cb	SCPN1-10443	2026-03-19 11:14:45 +01:00
Laurie Montant	07a50a71d9	SCPN1-10443	2026-03-18 11:13:55 +01:00
Laurie Montant	81c6dec4f2	SCPN1-10414	2026-03-11 11:29:53 +01:00
Laurie Montant	64fc9f3e15	SCPN1-10408	2026-03-10 10:42:51 +01:00
Francis Reat	a43e59f7cb	Merge branch 'SCPN1-10253-develop' into 'develop' SCPN1-10253 Closes SCPN1-10253 See merge request r-d-technique/tiers/reflex-wms-connector!253	2026-03-02 15:18:38 +00:00
Francis Reat	eea2a41313	SCPN1-10253	2026-03-02 16:18:04 +01:00
Francis Reat	2a908a85d7	SCPN1-10253	2026-03-02 12:10:01 +01:00
Francis Reat	70ec04c65a	Merge branch 'SCPN1-10253-develop' into 'develop' SCPN1-10253 Closes SCPN1-10253 See merge request r-d-technique/tiers/reflex-wms-connector!247	2026-02-27 15:40:15 +00:00
Francis Reat	4784cc2bc1	SCPN1-10253	2026-02-27 16:37:25 +01:00
Francis Reat	ac5219b94a	SCPN1-10253	2026-02-27 16:31:14 +01:00
Francis Reat	127a662057	SCPN1-10253	2026-02-27 09:45:31 +01:00
Francis Reat	da53dc05fc	Merge branch 'SCPN1-10253-develop' into 'develop' Resolve SCPN1-10253 "Develop" Closes SCPN1-10253 See merge request r-d-technique/tiers/reflex-wms-connector!246	2026-02-26 14:50:20 +00:00
Francis Reat	4823bc6fed	Merge branch 'develop' into SCPN1-10253-develop	2026-02-26 15:49:25 +01:00
Francis Reat	b1577d1791	SCPN1-10253	2026-02-26 15:48:51 +01:00
Francis Reat	1352a36a21	Merge branch 'SCPN1-10253-develop' into 'develop' SCPN1-10253 Closes SCPN1-10253 See merge request r-d-technique/tiers/reflex-wms-connector!245	2026-02-26 14:15:28 +00:00
Francis Reat	57113f4c51	SCPN1-10253	2026-02-26 15:15:11 +01:00
Francis Reat	1de2a47dae	Merge branch 'SCPN1-10253-develop' into 'develop' SCPN1-10253 Closes SCPN1-10253 See merge request r-d-technique/tiers/reflex-wms-connector!244	2026-02-26 08:00:33 +00:00
Francis Reat	02de559235	SCPN1-10253	2026-02-25 18:47:58 +01:00
Laurie Montant	b1527f9e7e	SCPN1-10294	2026-02-25 11:04:29 +01:00
Laurie Montant	7bb190e4f5	SCPN1-10294	2026-02-24 15:04:36 +01:00
Laurie Montant	c561f9674b	SCPN1-10294	2026-02-24 11:37:02 +01:00
Laurie Montant	d2b5eeafdf	SCPN1-10276	2026-02-24 09:37:32 +01:00
Francis Reat	d1c3bb9d16	Merge branch 'SCPN1-10276-develop' into 'develop' SCPN1-10276 Closes SCPN1-10276 See merge request r-d-technique/tiers/reflex-wms-connector!243	2026-02-20 15:11:30 +00:00
Francis Reat	dca0fa7fe4	SCPN1-10276	2026-02-20 13:52:18 +01:00
Laurie Montant	c3364d77a2	SCPN1-10244	2026-02-16 17:11:48 +01:00
Francis Reat	e24e537650	SCPN1-9965	2026-02-16 11:48:56 +01:00
Francis Reat	71bd4918a9	SCPN1-9965 (cherry picked from commit `7c4c7ea395`)	2026-02-13 10:58:36 +01:00
Francis Reat	8974632c22	Merge branch 'SCPN1-9965-tiny-url-appointment' into 'develop' SCPN1-9965 Closes SCPN1-9965 See merge request r-d-technique/tiers/reflex-wms-connector!242	2026-02-13 09:49:18 +00:00
Francis Reat	cb59aa28b5	SCPN1-9965	2026-02-13 10:48:40 +01:00
Laurie Montant	95f07b1ae0	SCPN1-10100	2026-02-02 11:25:32 +01:00
Laurie Montant	650990b045	SCPN1-10100	2026-01-30 16:02:20 +01:00
Laurie Montant	5b316bb395	SCPN1-10100	2026-01-28 16:55:00 +01:00
Laurie Montant	24d7ad81bd	SCPN1-10100	2026-01-28 16:43:49 +01:00
Laurie Montant	456b304879	SCPN1-10100	2026-01-28 16:34:14 +01:00
Laurie Montant	1772ed970b	SCPN1-10100	2026-01-28 14:48:31 +01:00
Laurie Montant	8d4eb4ec4c	SCPN1-10100	2026-01-28 14:39:01 +01:00
Laurie Montant	04a72fcda4	SCPN1-10100	2026-01-28 11:51:58 +01:00
Laurie Montant	264257fcd0	SCPN1-10100	2026-01-27 18:39:34 +01:00
Laurie Montant	944f3a2da5	SCPN1-10100	2026-01-27 18:32:34 +01:00
Laurie Montant	1c07a8dd77	SCPN1-10100	2026-01-27 18:23:15 +01:00
Laurie Montant	0f4191012d	SCPN1-10100	2026-01-27 17:12:04 +01:00
Laurie Montant	27ea4f3795	SCPN1-10100	2026-01-27 16:06:40 +01:00
Laurie Montant	5492139935	SCPN1-10100	2026-01-27 15:01:08 +01:00
Laurie Montant	c1ea6e46af	SCPN1-10100	2026-01-27 14:40:05 +01:00
Laurie Montant	efeb0c0185	SCPN1-10100	2026-01-27 14:34:06 +01:00
Laurie Montant	91467086c4	SCPN1-10100	2026-01-27 14:31:24 +01:00
Laurie Montant	b68855504a	SCPN1-10100	2026-01-27 14:03:17 +01:00
Laurie Montant	2d022ccf47	SCPN1-10100	2026-01-27 13:31:55 +01:00
Laurie Montant	9b5eec0f7f	SCPN1-10100	2026-01-27 12:05:58 +01:00
Laurie Montant	e12235319e	SCPN1-10100	2026-01-27 12:02:28 +01:00
Laurie Montant	289b8c3fc1	SCPN1-10100	2026-01-27 10:14:11 +01:00
Laurie Montant	c324773fad	SCPN1-10095	2026-01-26 16:57:23 +01:00
Laurie Montant	5552265833	SCPN1-10095	2026-01-26 16:52:31 +01:00
Laurie Montant	8fe3dd364c	SCPN1-10095	2026-01-26 15:33:35 +01:00
@@ -1 +1 @@
 .0.20+4
 .0.22+2