Release 1.2.45+3

Merge branch 'SCPN1-9348-1.2' into 'release/1.2'
SCPN1-9348-1.2 See merge request r-d-technique/tiers/reflex-wms-connector!140
2025-09-26 09:22:26 +02:00 · 2025-09-26 07:12:32 +00:00 · 2025-09-25 16:31:53 +02:00 · 2025-09-09 15:48:03 +02:00 · 2025-09-09 13:46:36 +00:00 · 2025-09-09 15:44:56 +02:00
6 changed files with 7 additions and 6 deletions
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -56,8 +56,7 @@
            <#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))>
+            <#if (!hd_numberHmap[despatched_ipg.hd_number]?? || !hd_numberHmap[despatched_ipg.carton_number]??) && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
               <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
               ,
               {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
--- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
+++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
@@ -53,8 +53,10 @@
    "Payload": {
      <#if despatched_ipg.carton_number != "000000000000000000">
      "HandlingunitID": "${despatched_ipg.carton_number}"
      <#assign hd_numberHmap += {despatched_ipg.carton_number,despatched_ipg.carton_number}>
      <#else>
      "HandlingunitID": "${despatched_ipg.hd_number}"
      <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
      </#if>
 	  <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
    ,
--- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@@ -14,7 +14,7 @@
          {
            "Header": {"ProjectID": "${projectRP}"},
            "ID": {
-                "RefID": "${receipt_line.receipt_reference?trim?json_string}",
+                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
              "RefDate": {
              "DateTime": "${receipt_status_datetime}",
              "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
@@ -14,7 +14,7 @@
          {
            "Header": {"ProjectID": "${projectRP}"},
            "ID": {
-                "RefID": "${receipt_line.receipt_reference?trim?json_string}",
+                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
              "RefDate": {
              "DateTime": "${receipt_status_datetime}",
              "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
@@ -14,7 +14,7 @@
          {
            "Header": {"ProjectID": "${projectRP}"},
            "ID": {
-                "RefID": "${receipt_line.receipt_reference?trim?json_string}",
+                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
              "RefDate": {
              "DateTime": "${receipt_status_datetime}",
              "AuthorTimeZone": "${time_zone_rfx}"
--- a/2
+++ b/2
@@ -1 +1 @@
-1.2.45+1
+1.2.45+3
Author	SHA1	Message	Date
frea	f373cbe734	Release 1.2.45+3	2025-09-26 09:22:26 +02:00
Francis Reat	1256e3d68c	Merge branch 'SCPN1-9348-1.2' into 'release/1.2' SCPN1-9348-1.2 See merge request r-d-technique/tiers/reflex-wms-connector!140	2025-09-26 07:12:32 +00:00
GROUP\frea	983a59b592	SCPN1-9348 (cherry picked from commit `cb2f8fe59e`)	2025-09-25 16:31:53 +02:00
frea	eb6fc3f4a3	Release 1.2.45+2	2025-09-09 15:48:03 +02:00
Francis Reat	8cf596e251	Merge branch 'SCPN1-9296-1.2-2' into 'release/1.2' SCPN1-9296 See merge request r-d-technique/tiers/reflex-wms-connector!136	2025-09-09 13:46:36 +00:00
GROUP\frea	55070c8ce3	SCPN1-9296	2025-09-09 15:44:56 +02:00