Merge branch 'release/2.0' into 'main-2.0'

release/2.0 into main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!232
Release 2.0.18+2
2026-01-27 07:56:59 +00:00 · 2026-01-27 08:56:06 +01:00 · 2026-01-27 07:53:20 +00:00 · 2026-01-27 08:37:08 +01:00 · 2026-01-27 08:36:54 +01:00 · 2026-01-26 16:01:53 +01:00
12 changed files with 44 additions and 40 deletions
--- a/RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl
+++ b/RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl
@ -7,9 +7,9 @@
        "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 -->
+				"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}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			</#if>
 		<#else>
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
--- a/RFXtoRP_HsrCarrierApt_CarrierArrived.ftl
+++ b/RFXtoRP_HsrCarrierApt_CarrierArrived.ftl
@ -7,15 +7,15 @@
        "ID": {
            <#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 -->
+                    "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}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "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>
            "RefDate": {
--- a/RFXtoRP_HsrCarrierApt_CarrierDeparted.ftl
+++ b/RFXtoRP_HsrCarrierApt_CarrierDeparted.ftl
@ -7,15 +7,15 @@
        "ID": {
           <#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 -->
+                    "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}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "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>
            "RefDate": {
--- a/RFXtoRP_HsrCarrierApt_LoadingCompleted.ftl
+++ b/RFXtoRP_HsrCarrierApt_LoadingCompleted.ftl
@ -7,15 +7,15 @@
        "ID": {
           <#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 -->
+                    "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}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "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>
            "RefDate": {
--- a/RFXtoRP_HsrCarrierApt_LoadingStarted.ftl
+++ b/RFXtoRP_HsrCarrierApt_LoadingStarted.ftl
@ -7,15 +7,15 @@
        "ID": {
            <#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 -->
+                    "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}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "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>
            "RefDate": {
--- a/RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl
@ -1,13 +1,17 @@
 <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.last_update_datetime,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}",
+		<#else>
+			"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+		</#if>
+	<#else>
 		<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
 			"AppointmentID": "${carrier_apt.appointment_reference?json_string}",
 		<#else>
-			<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
-				"AppointmentID": "${carrier_apt.appointment_reference?json_string}${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
-			<#else>
-				"AppointmentID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
+			"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 		</#if>
 	</#if>
    "Header": {
--- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
@ -6,9 +6,9 @@
 		"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 -->
+				"AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			<#else>
-				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			</#if>
 		<#else>
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
--- a/RFXtoRP_HsrCarrierApt_UnloadingCompleted.ftl
+++ b/RFXtoRP_HsrCarrierApt_UnloadingCompleted.ftl
@ -7,15 +7,15 @@
        "ID": {
            <#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 -->
+                    "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>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "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!="">
-                    "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>
            "RefDate": {
--- a/RFXtoRP_HsrCarrierApt_UnloadingStarted.ftl
+++ b/RFXtoRP_HsrCarrierApt_UnloadingStarted.ftl
@ -7,15 +7,15 @@
        "ID": {
            <#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 -->
+                    "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>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "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!="">
-                    "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>
            "RefDate": {
--- a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl
@ -7,9 +7,9 @@
        },
 		<#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 -->
+				"AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			<#else>
-				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			</#if>
 		<#else>
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
--- a/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl
@ -6,9 +6,9 @@
        },
 		<#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 -->
+				"AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			<#else>
-				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			</#if>
 		<#else>
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
--- a/2
+++ b/2
@ -1 +1 @@
-2.0.18+1
+2.0.18+2
Author	SHA1	Message	Date
Francis Reat	b78d04bfba	Merge branch 'release/2.0' into 'main-2.0' release/2.0 into main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!232	2026-01-27 07:56:59 +00:00
Francis Reat	4e436a918d	Release 2.0.18+2	2026-01-27 08:56:06 +01:00
Francis Reat	b21e75c8e2	Merge branch 'release2.0-SCPN1-10095' into 'release/2.0' release2.0-SCPN1-10095 into release/2.0 See merge request r-d-technique/tiers/reflex-wms-connector!230	2026-01-27 07:53:20 +00:00
Laurie Montant	caefae873c	SCPN1-10095 (cherry picked from commit c324773fad1b60fcc2fad64c853f1c4945209336)	2026-01-27 08:37:08 +01:00
Laurie Montant	f5c5afac1b	SCPN1-10095 (cherry picked from commit 5552265833aa9ec73aae44a0b3464e110f98d46d)	2026-01-27 08:36:54 +01:00
Laurie Montant	1864bef8bb	SCPN1-10095 (cherry picked from commit 8fe3dd364c3bf521f33b858cbe0ea1d96fbbd192)	2026-01-26 16:01:53 +01:00
Francis Reat	62688a15c4	Merge branch 'release/2.0' into 'main-2.0' release/2.0 into main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!227	2026-01-22 14:41:19 +00:00
Francis Reat	db3e72699e	Merge branch 'release/2.0' into 'main-2.0' release/2.0 into main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!223	2026-01-08 17:01:55 +00:00
Francis Reat	eaeed34a73	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!219	2026-01-08 09:30:52 +00:00
Francis Reat	fcddee4196	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!216	2026-01-08 07:56:14 +00:00
Cedric Rodier	d92fa3e2df	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 See merge request r-d-technique/tiers/reflex-wms-connector!213	2025-12-23 14:40:06 +00:00
Christian Senet	7db9eae7eb	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!208	2025-12-19 12:56:08 +00:00
Francis Reat	c16b522308	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!205	2025-12-18 08:09:23 +00:00
Francis Reat	7246a2a117	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!190	2025-12-03 09:18:55 +00:00
Francis Reat	a9aac3269e	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!186	2025-11-26 08:44:03 +00:00
Francis Reat	ec844cbe49	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!159	2025-11-06 10:11:10 +00:00
Francis Reat	39c8280fa4	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!157	2025-11-04 09:35:47 +00:00
Francis Reat	7cbc5111e9	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!155	2025-10-29 09:49:58 +00:00
Francis Reat	0d3b459386	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main 2.0 See merge request r-d-technique/tiers/reflex-wms-connector!152	2025-10-24 08:41:23 +00:00
Francis Reat	71fdf435bd	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main 2.0 See merge request r-d-technique/tiers/reflex-wms-connector!151	2025-10-16 13:50:08 +00:00
Francis Reat	7f55b4f86a	Merge branch 'release/2.0' into 'main-2.0' Release 2.0 to main 2.0 See merge request r-d-technique/tiers/reflex-wms-connector!142	2025-09-26 07:24:15 +00:00
Francis Reat	ca5ba7c103	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!139	2025-09-24 08:25:40 +00:00
Francis Reat	7e054d70d2	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!135	2025-09-09 07:31:32 +00:00
Francis Reat	75ab1602d4	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!131	2025-09-08 08:57:49 +00:00
Francis Reat	831e6f098b	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!127	2025-08-26 14:41:50 +00:00
Francis Reat	19de302683	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!123	2025-07-10 09:36:18 +00:00
Francis Reat	6d4e2d5949	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!115	2025-06-20 15:59:43 +00:00
Francis Reat	4d0382970f	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!113	2025-05-27 08:00:16 +00:00
Francis Reat	218cf62dae	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!109	2025-05-13 12:53:01 +00:00
Cedric Rodier	6ed0f8e9da	Merge branch 'release/2.0' into 'main' MR->Main See merge request r-d-technique/tiers/reflex-wms-connector!104	2025-04-24 15:04:25 +00:00
 @ -1 +1 @@
 .0.18+1
 .0.18+2