diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl
index 50ef75c..4ff1cb1 100644
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -27,7 +27,6 @@
           <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">  
           
         },
-
         {
           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> 
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -56,6 +55,13 @@
             "apiReflexPlatformID" :  "${apiReflexPlatformID}",
             "datas" :         
             <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">  
+          },
+          {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> 
+          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+          "datas" :         
+          <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">  
+          
           }
         </#if>
        ]  
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
new file mode 100644
index 0000000..8cabd47
--- /dev/null
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@@ -0,0 +1,20 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#assign receipt_status_datetime = receipt.modification_datetime?datetime(rfx_date_format_default)?iso_utc />
+
+[
+  {  
+    "Header": {
+      "ProjectID": "${projectRP}"     
+    },
+    "ID": {
+      "RefID": "${receipt.receipt_reference}",
+      "RefDate": {
+        "DateTime": "${receipt_status_datetime}",
+        "AuthorTimeZone": "${time_zone_rfx}"
+      }
+    },
+    "Payload": {
+    }
+  }
+]
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
index e9fbe46..bb6050e 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -18,12 +18,12 @@
          "CreationDateTime": {
            "DateTime": "${receipt_creation_datetime}",
            "AuthorTimeZone": "${time_zone_rfx}"
-            
              },   
-            
+   
        <#-- Header Metadata inclusion -->
        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">
-        "ShipFrom": 
+      
+      "ShipFrom": 
       {
       "ActorID": "${receipt.original_code}"
       },
@@ -35,7 +35,7 @@
         
       <#if receipt.carrier_informations.carrier_code != "">
           "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code}"}, 
-          </#if>         
+      </#if>         
        
       
        "Lines" : [
diff --git a/RFXtoRP_HsrReceiptList_OrderCancelled.ftl b/RFXtoRP_HsrReceiptList_OrderCancelled.ftl
deleted file mode 100644
index 61b9149..0000000
--- a/RFXtoRP_HsrReceiptList_OrderCancelled.ftl
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {  
-    "Header": {
-      "ProjectID": "${projectRP}"     
-    },
-    "ID": {
-      "RefID": "${receipt.receipt_reference}"
-    },
-    "Payload": {
-    }
-  }
-]
diff --git a/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl
new file mode 100644
index 0000000..64a33f1
--- /dev/null
+++ b/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl
@@ -0,0 +1,19 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#assign receipt_status_datetime = receipt.confirmation_datetime?datetime(rfx_date_format_default)?iso_utc />
+[
+  {  
+     "Header": {
+      "ProjectID": "${projectRP}"     
+    },
+    "ID": {
+      "RefID": "${receipt.receipt_reference}",
+      "RefDate": {
+        "DateTime": "${receipt_status_datetime}",
+        "AuthorTimeZone": "${time_zone_rfx}"
+      }
+    },
+    "Payload": {
+    }
+  }
+]
diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
index 0d9e3ff..5120310 100644
--- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
@@ -1,15 +1,15 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = receipt.creation_datetime?datetime(rfx_date_format_default)?iso_utc />
+<#assign receipt_status_datetime = receipt.creation_datetime?datetime(rfx_date_format_default)?iso_utc />
 [
   { 
     "Header": {
       "ProjectID": "${projectRP}"     
     },
     "ID": {
-         "RefID": "${order.originator_reference}",
+         "RefID": "${receipt.receipt_reference}",
        "RefDate": {
-        "DateTime": "${preparation_status_datetime}",
+        "DateTime": "${receipt_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"
       }
     },
diff --git a/RFXtoRP_HsrReceiptList_TransportCompleted.ftl b/RFXtoRP_HsrReceiptList_TransportCompleted.ftl
deleted file mode 100644
index 3bf47b7..0000000
--- a/RFXtoRP_HsrReceiptList_TransportCompleted.ftl
+++ /dev/null
@@ -1,14 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "projectCst.ftl">
-[
-  {  
-     "Header": {
-      "ProjectID": "${projectRP}"     
-    },
-    "ID": {
-      "RefID": "${receipt.receipt_reference}"
-    },
-    "Payload": {
-    }
-  }
-]