From 91916d910099cd4eb3f44756a37cf7738e47ff4c Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Mon, 13 Oct 2025 14:25:08 +0200
Subject: [PATCH] SCPN1-9437

(cherry picked from commit ae27efacf30349388d5d913cd11bceeed2b951e1)
---
 RFXtoRP_HsaItm.ftl                       | 5 -----
 RFXtoRP_HsaItm_ItemCreated.ftl           | 6 ++++--
 RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/RFXtoRP_HsaItm.ftl b/RFXtoRP_HsaItm.ftl
index 231b196..63ca3a2 100644
--- a/RFXtoRP_HsaItm.ftl
+++ b/RFXtoRP_HsaItm.ftl
@@ -18,15 +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>
-          <#--  "no LV for the item"-->
-          <#stop>
-        </#if>
          }
        ]
       <#break>
diff --git a/RFXtoRP_HsaItm_ItemCreated.ftl b/RFXtoRP_HsaItm_ItemCreated.ftl
index 1f22d6b..5186091 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}",
       </#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_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
index 2cb6932..fe21136 100644
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -39,7 +39,7 @@
             "ActorID": "${RFXtoRPprefixDepot(preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?json_string)}"
           <#else>
             <#if preparation_order.preparation_type_code == "030">
-              "ActorID": "${RFXtoRPprefixDepot(preparation_order.end_consignee_code?json_string)}"
+              "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}"
             <#else>
               <#if preparation_order.address.address_type_code == "" &&
               preparation_order.address.name_or_company_name == "" &&