From 6bb1d457832e280d46dbd439c579da9d07281f0b Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Thu, 16 Oct 2025 10:23:56 +0200
Subject: [PATCH] SCPN1-9437

(cherry picked from commit f05096636edcb4ba73d91a745a0d05f5a1e16f9b)
---
 RFXtoRP_HsaItm.ftl                                   |  4 ----
 RFXtoRP_HsaItm_ItemCreated.ftl                       |  8 +++++---
 RFXtoRP_HsrReceiptList.ftl                           |  7 +------
 RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl    |  4 ++++
 RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl     | 12 ++++++++++--
 ..._HsrReceiptList_ExecutionflowReceiptCompleted.ftl |  4 ++++
 RFXtoRP_HsrReceiptList_ReceiptExpected.ftl           |  4 ++++
 7 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/RFXtoRP_HsaItm.ftl b/RFXtoRP_HsaItm.ftl
index 533a2b7..63ca3a2 100644
--- a/RFXtoRP_HsaItm.ftl
+++ b/RFXtoRP_HsaItm.ftl
@@ -18,14 +18,10 @@
       <#assign item = JsonUtil.jsonToMap(dataRfx)>
        [
          {
-           <#if item.logistical_variant_list??  && (item.logistical_variant_list?size == item.logistical_variant_list?filter(l ->l??)?size)>
            <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemCreated>
            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
            "datas" :
             <#include "RFXtoRP_HsaItm_ItemCreated.ftl">
-        <#else>
-          <#stop "no LV for the item">
-        </#if>
          }
        ]
       <#break>
diff --git a/RFXtoRP_HsaItm_ItemCreated.ftl b/RFXtoRP_HsaItm_ItemCreated.ftl
index 1f22d6b..4433f6e 100644
--- a/RFXtoRP_HsaItm_ItemCreated.ftl
+++ b/RFXtoRP_HsaItm_ItemCreated.ftl
@@ -21,15 +21,17 @@
       },
 
       <#-- Item metadata inclusion -->
-      <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">,
+      <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">
 
       <#-- Item Photo URI could be added here -->
       <#if item.url?? && item.url!="">
-        "PhotoURI": "${item.url?json_string}",
+      ,
+        "PhotoURI": "${item.url?json_string}"
       </#if>
 
     <#-- Loop for the Logistical Variants - LV -->
-        <#if item.logistical_variant_list??>
+        <#if item.logistical_variant_list?? && (item.logistical_variant_list?size == item.logistical_variant_list?filter(l ->l??)?size)>
+        ,
           "LogisticVariants": [
 
            <#list item.logistical_variant_list as logistical_variant>
diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl
index be3d0c9..9bf1a2d 100644
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -15,7 +15,6 @@
 
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
-      <#if receipt.receipt_reference ?? && receipt.receipt_reference!="">
         <#if receipt.receipt_type == "030">
           <#stop "ignored message because receipt type = transfert">
         <#else>
@@ -40,11 +39,7 @@
             <#--  No line-->
             <#stop>
           </#if>
-      </#if>
-    <#else>
-      <#--  "Receipt reference is empty"-->
-      <#stop>
-    </#if>
+        </#if>
       <#break>
     <#case "U">
        <#-- *********************************************** Action = UPDATE ******************** -->
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
index 1c838f8..0751f1a 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@@ -29,7 +29,11 @@
         {
           "Header": {"ProjectID": "${projectRP}"},
           "ID": {
+            <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
               "RefID": "${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": {
               "DateTime": "${receipt_status_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
index 6d21132..0d3b976 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -9,7 +9,11 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
+      <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+        "RefID": "${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": {
             "DateTime": "${receipt_creation_datetime}",
             "AuthorTimeZone": "${time_zone_rfx}"
@@ -44,7 +48,11 @@
           "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
         },
       </#if>
-      "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.line_list??>
        "Lines" : [
           <#list receipt.line_list as line>
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
index 1c838f8..0751f1a 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
@@ -29,7 +29,11 @@
         {
           "Header": {"ProjectID": "${projectRP}"},
           "ID": {
+            <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
               "RefID": "${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": {
               "DateTime": "${receipt_status_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
index 1c838f8..0751f1a 100644
--- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
@@ -29,7 +29,11 @@
         {
           "Header": {"ProjectID": "${projectRP}"},
           "ID": {
+            <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
               "RefID": "${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": {
               "DateTime": "${receipt_status_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"