diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
index 1aaa0c4..a78b5bf 100644
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
@@ -7,10 +7,23 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-       <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+      <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+        <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" >
           "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}",
+        <#else>
+          "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+        </#if>
       <#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 receipt.line_list??>
+        <#list receipt.line_list as receipt_line>
+          <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
+            <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" >
+              "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_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>
+          </#if>
+        </#if>
       </#if>
       "RefDate": {
         "DateTime": "${receipt_status_datetime}",