diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl
index 872af00..649c426 100644
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -33,7 +33,7 @@
 
           }
           ]
-        <#else>
+          <#else>
           [
           {
             <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
@@ -61,36 +61,54 @@
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
        [
         <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-          <#if receipt.receipt_type = "030" && receipt.receipt_confirmed == "true" >
+          <#if receipt.receipt_type = "030" && 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.ExecutionflowReceiptCompleted>
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
-              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
-            }
-          <#else>
-            <#if receipt.receipt_confirmed == "true">
-              {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl">
             }
             <#else>
+              <#if receipt.receipt_type = "030" && receipt.receipt_confirmed == "true">
               {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
                 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                 "datas" :
-                <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
-              },
-              {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
-            }
+                <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
+              }
+              <#else>
+                <#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.ExecutionflowReceiptCompleted>
+                  "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">
+                    }
+                  <#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>
             </#if>
-          </#if>
         <#else>
           <#stop "Receipt reference is empty">
         </#if>
diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
index e262117..3be4a3f 100644
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
@@ -8,7 +8,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${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_reference?trim?json_string}",
       "RefDate": {
         "DateTime": "${receipt_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"