Merge branch 'release/1.2' into 'main-1.2'

Release/1.2 to main1.2

See merge request r-d-technique/tiers/reflex-wms-connector!160

RFXtoRP_HliReceiptLr.ftl

@@ -15,7 +15,6 @@
 
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
-      <#if receipt.receipt_reference ?? && receipt.receipt_reference!="">
         <#if receipt.receipt_type == "030">
           <#stop "ignored message because receipt type = transfert">
         <#else>
@@ -41,10 +40,6 @@
             <#stop>
           </#if>
       </#if>
-    <#else>
-      <#--  "Receipt reference is empty"-->
-      <#stop>
-    </#if>
       <#break>
     <#case "U">
        <#-- *********************************************** Action = UPDATE ******************** -->

RFXtoRP_HliReceiptLr_ExecutionflowLinesAdded.ftl

@@ -9,7 +9,11 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
+      <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+        "RefID": "${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_year}${receipt.receipt_number}",
+      </#if>
       "RefDate": {
             "DateTime": "${receipt_creation_datetime}",
             "AuthorTimeZone": "${time_zone_rfx}"

VERSION

@@ -1 +1 @@
-1.2.47+1
+1.2.48+1