Release 1.2.44+2

Merge branch 'SCPN1-9288-1.2' into 'release/1.2'
SCPN1-9288-1.2 See merge request r-d-technique/tiers/reflex-wms-connector!128
2025-09-08 10:42:36 +02:00 · 2025-09-08 08:38:28 +00:00 · 2025-09-08 10:13:17 +02:00 · 2025-09-08 10:12:23 +02:00 · 2025-09-08 10:12:03 +02:00
5 changed files with 8 additions and 8 deletions
--- a/RFXtoRP_HsaItm_ItemCreated.ftl
+++ b/RFXtoRP_HsaItm_ItemCreated.ftl
@@ -37,7 +37,7 @@
            "LVID": "${logistical_variant.logistical_variant_code?json_string}",
            "Name" : "${logistical_variant.lv_type_code?json_string}",

-              <#if logistical_variant.id_list??>
+              <#if logistical_variant.id_list?? && (logistical_variant.id_list?size == logistical_variant.id_list?filter(l ->l??)?size)>
            "Codes": [
                       <#list logistical_variant.id_list as id>
                       {
--- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@@ -5,7 +5,7 @@
 [
  <#if receipt.line_list??>
    <#list receipt.line_list as receipt_line >
-      <#if receipt_line.origin_order_line_reference!="">
+      <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
        <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
          <#if refIDHmap_local?size != 0 >
          ,
@@ -14,7 +14,7 @@
          {
            "Header": {"ProjectID": "${projectRP}"},
            "ID": {
-                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
+                "RefID": "${receipt_line.receipt_reference?trim?json_string}",
              "RefDate": {
              "DateTime": "${receipt_status_datetime}",
              "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
@@ -5,7 +5,7 @@
 [
  <#if receipt.line_list??>
    <#list receipt.line_list as receipt_line >
-      <#if receipt_line.origin_order_line_reference!="">
+      <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
        <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
          <#if refIDHmap_local?size != 0 >
          ,
@@ -14,7 +14,7 @@
          {
            "Header": {"ProjectID": "${projectRP}"},
            "ID": {
-                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
+                "RefID": "${receipt_line.receipt_reference?trim?json_string}",
              "RefDate": {
              "DateTime": "${receipt_status_datetime}",
              "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
@@ -5,7 +5,7 @@
 [
  <#if receipt.line_list??>
    <#list receipt.line_list as receipt_line >
-      <#if receipt_line.origin_order_line_reference!="">
+      <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
        <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
          <#if refIDHmap_local?size != 0 >
          ,
@@ -14,7 +14,7 @@
          {
            "Header": {"ProjectID": "${projectRP}"},
            "ID": {
-                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
+                "RefID": "${receipt_line.receipt_reference?trim?json_string}",
              "RefDate": {
              "DateTime": "${receipt_status_datetime}",
              "AuthorTimeZone": "${time_zone_rfx}"
--- a/2
+++ b/2
@@ -1 +1 @@
-1.2.44+1
+1.2.44+2
Author	SHA1	Message	Date
frea	6d6a56710b	Release 1.2.44+2	2025-09-08 10:42:36 +02:00
Francis Reat	9b93729ab4	Merge branch 'SCPN1-9288-1.2' into 'release/1.2' SCPN1-9288-1.2 See merge request r-d-technique/tiers/reflex-wms-connector!128	2025-09-08 08:38:28 +00:00
Laurie Montant	18c4959a62	Correction 080925 (cherry picked from commit `0ad605af1d`)	2025-09-08 10:13:17 +02:00
Laurie Montant	efe3ac2134	Corrections 250908 (cherry picked from commit `17830c1c6e`)	2025-09-08 10:12:23 +02:00
Laurie Montant	0d162d5de2	Correction 080925 (cherry picked from commit `0ad605af1d`)	2025-09-08 10:12:03 +02:00
@@ -1 +1 @@
 .2.44+1
 .2.44+2