From 8d74d8f085d0c56b2db75def79e7f78c2e5bde09 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Fri, 13 Jun 2025 11:49:45 +0200
Subject: [PATCH] SCPN1-8871

---
 ..._HsrReceiptList_ExecutionflowCancelled.ftl |  6 +----
 ...P_HsrReceiptList_ExecutionflowDetected.ftl | 13 +++++------
 ...eiptList_ExecutionflowReceiptCompleted.ftl |  6 +----
 RFXtoRP_HsrReceiptList_ReceiptExpected.ftl    |  6 +----
 ...ptList_TransfertExecutionflowCancelled.ftl | 16 +++++++-------
 ...iptList_TransfertExecutionflowDetected.ftl | 22 +++++++++----------
 ...TransfertExecutionflowReceiptCompleted.ftl | 12 +++++-----
 ...srReceiptList_TransfertReceiptExpected.ftl | 12 +++++-----
 8 files changed, 40 insertions(+), 53 deletions(-)

diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
index 14c3676..d0009e8 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@@ -8,11 +8,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#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": "${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>
+      "RefID": "${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}",
       "RefDate": {
         "DateTime": "${receipt_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
index e8e352f..fb5d6ed 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -9,11 +9,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#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": "${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>
+      "RefID": "${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}",
       "RefDate": {
             "DateTime": "${receipt_creation_datetime}",
             "AuthorTimeZone": "${time_zone_rfx}"
@@ -41,8 +37,11 @@
          "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
       },
       "ShipToAcked": true,
-      "OrderID":"${receipt.receipt_reference?trim?json_string}",
-
+      <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+        "OrderID":"${receipt.receipt_reference?trim?json_string}",
+      <#else>
+        "OrderID":"${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.carrier_informations.carrier_code != "">
         "Carrier":
         {
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
index 374f669..821bb30 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
@@ -7,11 +7,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#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": "${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>
+      "RefID": "${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}",
       "RefDate": {
         "DateTime": "${receipt_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
index 28eb86d..ddd1145 100644
--- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
@@ -8,12 +8,8 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-    <#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": "${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>
-       "RefDate": {
+      "RefDate": {
         "DateTime": "${receipt_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"
       }
diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
index 835c159..1dbc587 100644
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
@@ -7,11 +7,11 @@
     {
       "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!="">
+              "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+          <#else>
+            "RefID": "${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>
         "RefDate": {
           "DateTime": "${receipt_status_datetime}",
           "AuthorTimeZone": "${time_zone_rfx}"
@@ -32,10 +32,10 @@
             {
               "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_line.origin_order_line_reference?trim?json_string}",
+                <#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_year}${receipt.receipt_number}",
                 <#else>
-                  "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
+                  "RefID": "${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>
                 "RefDate": {
                 "DateTime": "${receipt_status_datetime}",
diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
index 3083c80..7c51e68 100644
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
@@ -10,9 +10,9 @@
       "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}",
+              "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
           <#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}",
+            "RefID": "${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>
         "RefDate": {
               "DateTime": "${receipt_creation_datetime}",
@@ -20,11 +20,11 @@
               }
       },
       "Payload": {
-          "CreationDateTime": {
-            "DateTime": "${receipt_creation_datetime}",
-            "AuthorTimeZone": "${time_zone_rfx}"
-            },
-          "OrderID":"${receipt.receipt_reference?trim?json_string}",
+        "CreationDateTime": {
+          "DateTime": "${receipt_creation_datetime}",
+          "AuthorTimeZone": "${time_zone_rfx}"
+          },
+        "OrderID":"${receipt.receipt_reference?trim?json_string}",
         <#-- Header Metadata inclusion -->
         <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
         "ShipFrom":
@@ -103,9 +103,9 @@
               "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_line.origin_order_line_reference?trim?json_string}",
+                "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
               <#else>
-                "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
+                "RefID": "${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>
                 "RefDate": {
                       "DateTime": "${receipt_creation_datetime}",
@@ -117,7 +117,7 @@
                     "DateTime": "${receipt_creation_datetime}",
                     "AuthorTimeZone": "${time_zone_rfx}"
                     },
-                  "OrderID":"${receipt.receipt_reference?trim?json_string}",
+                  "OrderID":"${receipt_line.origin_order_line_reference?trim?json_string}",
                 <#-- Header Metadata inclusion -->
                 <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
                 "ShipFrom":
@@ -199,7 +199,7 @@
                     "DateTime": "${receipt_creation_datetime}",
                     "AuthorTimeZone": "${time_zone_rfx}"
                     },
-                  "OrderID":"${receipt.receipt_reference?trim?json_string}",
+                  "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}",
                 <#-- Header Metadata inclusion -->
                 <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
                 "ShipFrom":
diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
index 8bb3029..18cb13f 100644
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
@@ -7,10 +7,10 @@
     {
       "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}",
+       <#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_year}${receipt.receipt_number}",
         <#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}",
+          "RefID": "${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>
         "RefDate": {
           "DateTime": "${receipt_status_datetime}",
@@ -32,10 +32,10 @@
             {
               "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_line.origin_order_line_reference?trim?json_string}",
+                <#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_year}${receipt.receipt_number}",
                 <#else>
-                  "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
+                  "RefID": "${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>
                 "RefDate": {
                 "DateTime": "${receipt_status_datetime}",
diff --git a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
index b65d4b7..a88d3e3 100644
--- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
@@ -7,10 +7,10 @@
     {
       "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}",
+        <#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_year}${receipt.receipt_number}",
         <#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}",
+          "RefID": "${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>
         "RefDate": {
           "DateTime": "${receipt_status_datetime}",
@@ -32,10 +32,10 @@
             {
               "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_line.origin_order_line_reference?trim?json_string}",
+                <#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_year}${receipt.receipt_number}",
                 <#else>
-                  "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
+                  "RefID": "${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>
                 "RefDate": {
                 "DateTime": "${receipt_status_datetime}",