diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
index f7827f3..786fa41 100644
--- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
+++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
@@ -34,21 +34,15 @@
             "ExecutionflowID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
             "OrderID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
           <#else>
-            <#if reflexMvtStockInterface.receipt_reference!="">
+            <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
               "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
               "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
-            <#else>
-              "ExecutionflowID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
-              "OrderID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
             </#if>
           </#if>
         <#else>
-          <#if reflexMvtStockInterface.receipt_reference!="">
+          <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
             "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
             "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
-          <#else>
-            "ExecutionflowID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
-            "OrderID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
           </#if>
         </#if>
         <#if reflexMvtStockInterface.origin_order_line_number?? && reflexMvtStockInterface.origin_order_line_number!=0>
diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl
index 20c2768..ae9ca29 100644
--- a/RFXtoRP_HsaProStatus.ftl
+++ b/RFXtoRP_HsaProStatus.ftl
@@ -17,6 +17,7 @@
       <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) />
       [
          <#--**Pick batch runned (200) **-->
+      <#if  preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
          <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
             {
             <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected>
@@ -63,6 +64,9 @@
                </#if>
             </#if>
          </#if>
+      <#else>
+         <#stop "PRO reference is empty">
+      </#if>
       ]
       <#break>
 
diff --git a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
index 2c04263..a54077e 100644
--- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
@@ -8,11 +8,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
-        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
-      <#else>
-        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}",
-      </#if>
+    "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
     "RefDate": {
       "DateTime": "${preparation_status_datetime}",
       "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
index 38cc6b9..621c029 100644
--- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
@@ -7,11 +7,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
-        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
-      <#else>
-        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}",
-      </#if>
+       "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
        "RefDate": {
         "DateTime": "${preparation_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsaProStatus_PreparationExpected.ftl b/RFXtoRP_HsaProStatus_PreparationExpected.ftl
index b0775d4..775ca0b 100644
--- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl
@@ -7,11 +7,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-        <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
-          "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
-        <#else>
-          "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}",
-        </#if>
+        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
         "RefDate": {
           "DateTime": "${preparation_status_datetime}",
           "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsaProStatus_PreparationStarted.ftl b/RFXtoRP_HsaProStatus_PreparationStarted.ftl
index b0775d4..775ca0b 100644
--- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl
@@ -7,11 +7,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-        <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
-          "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
-        <#else>
-          "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}",
-        </#if>
+        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
         "RefDate": {
           "DateTime": "${preparation_status_datetime}",
           "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsaProStatus_TransportStarted.ftl b/RFXtoRP_HsaProStatus_TransportStarted.ftl
index 4848d48..97d9d7e 100644
--- a/RFXtoRP_HsaProStatus_TransportStarted.ftl
+++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl
@@ -7,11 +7,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-        <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
-          "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
-        <#else>
-          "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}",
-        </#if>
+        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
        "RefDate": {
           "DateTime": "${preparation_status_datetime}",
           "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl
index 301a390..5bbd320 100644
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -52,7 +52,7 @@
             <#assign refIDHmap ={}>
             <#assign hd_numberHmap ={}>
             <#assign hd_numberHmapHUadded ={}>
-            <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? ) as preparation_line>
+            <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
             <#list preparation_line.despatched_ipg_list as despatched_ipg>
             <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
             <#if !hd_numberHmap[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
index 1ab5972..8c9ebc6 100644
--- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
@@ -3,12 +3,8 @@
 <#include "ActorPrefix.ftl">
 [
   <#assign refIDHmap_local ={}>
-   <#list preparationOrder.preparation_line_lst as preparation_line>
-  <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!="">
+   <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
     <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
-  <#else>
-    <#assign OrderOriginReference = "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}">
-  </#if>
    <#if !refIDHmap_local[OrderOriginReference]?? >
       <#if refIDHmap_local?size != 0 >
       ,
diff --git a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
index d04d8c6..5fe5ad8 100644
--- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
@@ -3,7 +3,7 @@
 [
 <#assign dispatched_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
 <#assign refIDHmap_local ={}>
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 ) as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line>
     <#list preparation_line.despatched_ipg_list as despatched_ipg>
       <#if !refIDHmap_local[despatched_ipg.hd_number]?? >
           <#if refIDHmap_local?size != 0 >
diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
index af4010f..fe55ffc 100644
--- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
@@ -2,7 +2,7 @@
 <#include "HfRpConfig.ftl">
 <#include "ActorPrefix.ftl">
 [
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 ) as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line>
     <#list preparation_line.despatched_ipg_list as despatched_ipg>
     <#assign packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
     {
@@ -111,14 +111,9 @@
 
        <#-- Segmentation Keys inclusion -->
        <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
-         },
-        <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!="">
-          "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
-          "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
-        <#else>
-          "OrderID": "O${preparationOrder.physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year?trim?json_string}${preparation_line.pro_number?trim?json_string}",
-          "ExecutionflowID": "O${preparationOrder.physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year?trim?json_string}${preparation_line.pro_number?trim?json_string}",
-        </#if>
+        },
+        "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
+        "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
         <#if (preparation_line.pro_originator_reference_line_number!0) != 0>
           "LineID": "${preparation_line.pro_originator_reference_line_number}",
         <#else>
diff --git a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
index d089f7c..a8df9a9 100644
--- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
@@ -3,12 +3,8 @@
 <#include "ActorPrefix.ftl">
 [
   <#assign refIDHmap_local ={}>
-  <#list preparationOrder.preparation_line_lst as preparation_line>
-   <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!="">
-    <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
-  <#else>
-    <#assign OrderOriginReference = "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}">
-  </#if>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
+  <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
     <#if !refIDHmap_local[OrderOriginReference]?? >
       <#if refIDHmap_local?size != 0 >
       ,
diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl
index c1ec47e..37badb5 100644
--- a/RFXtoRP_HsrPro.ftl
+++ b/RFXtoRP_HsrPro.ftl
@@ -16,7 +16,7 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
        [
-
+        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
           <#-- check preparation type code (internal order and reservation are ignored)  -->
           <#if preparation_order.preparation_type_code?? && (preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030")>
             <#-- Only if preparation order not confirmed  -->
@@ -34,8 +34,12 @@
 
           <#else>
           <#-- preparation order type not supported -->
-          <#stop>
+            <#stop>
           </#if>
+        <#else>
+          <#-- PRO reference is empty -->
+          <#stop>
+        </#if>
        ]
   <#break>
 
@@ -44,12 +48,17 @@
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
        [
+        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
         {
           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
           <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
         }
+        <#else>
+          <#-- PRO reference is empty -->
+          <#stop>
+        </#if>
        ]
          <#break>
 
diff --git a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
index 36c24dc..b518fa7 100644
--- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
@@ -7,11 +7,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
-        "RefID": "${preparation_order.originator_reference?trim?json_string}",
-      <#else>
-        "RefID": "O${preparation_order.physical_depot_code}${preparation_order.activity_code}${preparation_order.originator_code}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
-      </#if>
+      "RefID": "${preparation_order.originator_reference?trim?json_string}",
        "RefDate": {
         "DateTime": "${preparation_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
index d57a789..8aff3af 100644
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -9,11 +9,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
-        "RefID": "${preparation_order.originator_reference?trim?json_string}",
-      <#else>
-        "RefID": "O${preparation_order.physical_depot_code}${preparation_order.activity_code}${preparation_order.originator_code}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
-      </#if>
+    "RefID": "${preparation_order.originator_reference?trim?json_string}",
     "RefDate": {
             "DateTime": "${pro_creation_datetime}",
            "AuthorTimeZone": "${time_zone_rfx}"
@@ -82,11 +78,7 @@
                 }
           </#if>
          },
-        <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
-          "OrderID": "${preparation_order.originator_reference?trim?json_string}",
-        <#else>
-          "OrderID": "O${preparation_order.physical_depot_code}${preparation_order.activity_code}${preparation_order.originator_code}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
-        </#if>
+        "OrderID": "${preparation_order.originator_reference?trim?json_string}",
        <#if preparation_order.line_list??>
        "Lines" : [
            <#list preparation_order.line_list as preparation_order_line >
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
index ea0e361..ee94331 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@@ -39,20 +39,6 @@
           }
         }
         <#break>
-        <#else>
-          {
-            "Header": {"ProjectID": "${projectRP}"},
-            "ID": {
-              "RefID": "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}",
-              "RefDate": {
-              "DateTime": "${receipt_status_datetime}",
-              "AuthorTimeZone": "${time_zone_rfx}"
-              }
-            },
-            "Payload": {
-            }
-          }
-        <#break>
         </#if>
       </#if>
     </#list>
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
index a0e1865..6d21132 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -9,11 +9,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-        "RefID": "${receipt.receipt_reference?trim?json_string}",
-      <#else>
-        "RefID": "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>
+      "RefID": "${receipt.receipt_reference?trim?json_string}",
       "RefDate": {
             "DateTime": "${receipt_creation_datetime}",
             "AuthorTimeZone": "${time_zone_rfx}"
@@ -48,15 +44,7 @@
           "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)
+      "OrderID": "${receipt.receipt_reference?trim?json_string}",
       <#if receipt.line_list??>
        "Lines" : [
           <#list receipt.line_list as line>
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
index dd5d917..ee94331 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) />
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
 <#assign refIDHmap_local ={}>
 [
   <#if receipt.line_list??>
@@ -39,20 +39,6 @@
           }
         }
         <#break>
-        <#else>
-          {
-            "Header": {"ProjectID": "${projectRP}"},
-            "ID": {
-              "RefID": "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}",
-              "RefDate": {
-              "DateTime": "${receipt_status_datetime}",
-              "AuthorTimeZone": "${time_zone_rfx}"
-              }
-            },
-            "Payload": {
-            }
-          }
-        <#break>
         </#if>
       </#if>
     </#list>
diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
index ea0e361..ee94331 100644
--- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
@@ -39,20 +39,6 @@
           }
         }
         <#break>
-        <#else>
-          {
-            "Header": {"ProjectID": "${projectRP}"},
-            "ID": {
-              "RefID": "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}",
-              "RefDate": {
-              "DateTime": "${receipt_status_datetime}",
-              "AuthorTimeZone": "${time_zone_rfx}"
-              }
-            },
-            "Payload": {
-            }
-          }
-        <#break>
         </#if>
       </#if>
     </#list>