diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl
index 9785951..394713c 100644
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -15,25 +15,29 @@
 
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
-      <#if receipt.receipt_type == "030">
-      <#stop "ignored message because receipt type = transfert">
+      <#if receipt.receipt_reference ?? && receipt.receipt_reference!="">
+        <#if receipt.receipt_type == "030">
+        <#stop "ignored message because receipt type = transfert">
+        <#else>
+          [
+          {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+
+          },
+          {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+
+          }
+          ]
+        </#if>
       <#else>
-        [
-        {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
-          <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
-
-        },
-        {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
-          <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
-
-        }
-        ]
+        <#stop "Receipt reference is empty">
       </#if>
       <#break>
     <#case "U">
@@ -41,39 +45,43 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
        [
-        <#if receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
-          {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
-          <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
-          }
-        <#else>
-          <#if receipt.receipt_confirmed == "true" >
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
-            }
+        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+         <#if receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+                  }
           <#else>
-            <#if receipt.receipt_type == "030">
-              <#stop "ignored message because receipt type = transfert">
-            <#else>
+            <#if receipt.receipt_confirmed == "true" >
               {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
                 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                 "datas" :
-                <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
-              },
-              {
+                <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+              }
+            <#else>
+              <#if receipt.receipt_type == "030">
+                <#stop "ignored message because receipt type = transfert">
+              <#else>
+                {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+                },
+                {
                 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
                 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                 "datas" :
                 <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
-              }
+                }
+              </#if>
             </#if>
           </#if>
+        <#else>
+          <#stop "Receipt reference is empty">
         </#if>
        ]
       <#break>
@@ -83,14 +91,21 @@
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
        [
-        {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
-          <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
-        }
+        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+          {
+
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+          }
+        <#else>
+          <#stop "Receipt reference is empty">
+        </#if>
        ]
-       <#break>
+         <#break>
+
+
     <#default>
           <#stop >
 </#switch>
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
index b5b9b99..ea0e361 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@@ -57,4 +57,4 @@
       </#if>
     </#list>
   </#if>
-]
\ No newline at end of file
+]
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
index 56f2c78..a0e1865 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -48,11 +48,15 @@
           "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
         },
       </#if>
+<<<<<<< HEAD
       <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
         "OrderID": "${receipt.receipt_reference?trim?json_string}",
       <#else>
         "OrderID": "R${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}",
       </#if>
+=======
+
+>>>>>>> parent of 8abf277 (SCPN1-8865)
       <#if receipt.line_list??>
        "Lines" : [
           <#list receipt.line_list as line>
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
index 5c835a6..dd5d917 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
@@ -57,4 +57,4 @@
       </#if>
     </#list>
   </#if>
-]
\ No newline at end of file
+]
diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
index b5b9b99..ea0e361 100644
--- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
@@ -57,4 +57,4 @@
       </#if>
     </#list>
   </#if>
-]
\ No newline at end of file
+]