revert

2025-07-17 14:08:14 +02:00
parent 7bf9d3c674
commit 7d998634d3
5 changed files with 70 additions and 51 deletions
--- 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>