From 9f34588a6aa52ded485a65b1bad6cba70f8ecef3 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Mon, 7 Jul 2025 15:41:19 +0200
Subject: [PATCH] Receipt

---
 RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 56 +++++++++++-----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
index f1397f7..774c43a 100644
--- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
@@ -24,35 +24,35 @@
             }
           }
         </#if>
+      <#else>
+        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+        {
+          "Header": {"ProjectID": "${projectRP}"},
+          "ID": {
+              "RefID": "${receipt.receipt_reference?trim?json_string}",
+            "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+            }
+          },
+          "Payload": {
+          }
+        }
+        <#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": {
+            }
+          }
+        </#if>
       </#if>
     </#list>
-  <#else>
-    <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-    {
-      "Header": {"ProjectID": "${projectRP}"},
-      "ID": {
-          "RefID": "${receipt.receipt_reference?trim?json_string}",
-        "RefDate": {
-          "DateTime": "${receipt_status_datetime}",
-          "AuthorTimeZone": "${time_zone_rfx}"
-        }
-      },
-      "Payload": {
-      }
-    }
-    <#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": {
-        }
-      }
-    </#if>
   </#if>
 ]
\ No newline at end of file