From b812177bf5a582f1a7e5856bf4a3f222cddd8398 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Wed, 5 Nov 2025 15:52:39 +0100
Subject: [PATCH] SCPN1-9615

(cherry picked from commit d0e4342b34198d124db3398c527f321a20f57945)
---
 RFXtoRP_HliReceiptLr.ftl                         | 5 -----
 RFXtoRP_HliReceiptLr_ExecutionflowLinesAdded.ftl | 6 +++++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/RFXtoRP_HliReceiptLr.ftl b/RFXtoRP_HliReceiptLr.ftl
index 7b49927..b32cc46 100644
--- a/RFXtoRP_HliReceiptLr.ftl
+++ b/RFXtoRP_HliReceiptLr.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>
@@ -41,10 +40,6 @@
             <#stop>
           </#if>
       </#if>
-    <#else>
-      <#--  "Receipt reference is empty"-->
-      <#stop>
-    </#if>
       <#break>
     <#case "U">
        <#-- *********************************************** Action = UPDATE ******************** -->
diff --git a/RFXtoRP_HliReceiptLr_ExecutionflowLinesAdded.ftl b/RFXtoRP_HliReceiptLr_ExecutionflowLinesAdded.ftl
index 5a805a0..9e7047e 100644
--- a/RFXtoRP_HliReceiptLr_ExecutionflowLinesAdded.ftl
+++ b/RFXtoRP_HliReceiptLr_ExecutionflowLinesAdded.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}"