Release 1.2.45+1

Merge branch 'SCPN1-9296-1.2' into 'release/1.2'
SCPN1-9296-1.2 See merge request r-d-technique/tiers/reflex-wms-connector!132
2025-09-09 09:24:36 +02:00 · 2025-09-09 07:22:34 +00:00 · 2025-09-09 09:00:24 +02:00 · 2025-09-08 18:02:43 +02:00 · 2025-09-08 10:42:36 +02:00 · 2025-09-08 08:38:28 +00:00
7 changed files with 10 additions and 9 deletions
--- a/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl
+++ b/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl
@@ -12,7 +12,7 @@
           {
          "LVID": "${lv.logistical_variant_code?json_string}",
          "Name" : "${lv.lv_type_code?json_string}",
-          <#if lv.id_list??>
+          <#if lv.id_list??  && (lv.id_list?size == lv.id_list?filter(l ->l??)?size)>
          "Codes": [
                   <#list lv.id_list as id>
                   {
--- 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/RPtoRFX_ExecutionflowEvent.ftl
+++ b/RPtoRFX_ExecutionflowEvent.ftl
@@ -17,6 +17,7 @@
 <#switch eventRP.event>
 	  <#case "Created">
 	  <#case "Renotified">
 			 <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
 			<#assign executionflow = eventRP.data />
--- a/2
+++ b/2
@@ -1 +1 @@
-1.2.44+1
+1.2.45+1
Author	SHA1	Message	Date
frea	928c05bff4	Release 1.2.45+1	2025-09-09 09:24:36 +02:00
Francis Reat	2d8bdeb8a5	Merge branch 'SCPN1-9296-1.2' into 'release/1.2' SCPN1-9296-1.2 See merge request r-d-technique/tiers/reflex-wms-connector!132	2025-09-09 07:22:34 +00:00
Laurie Montant	bb2aaae375	Correction list (cherry picked from commit `7d874d7a68`)	2025-09-09 09:00:24 +02:00
Laurie Montant	f4286949f7	Renotified (cherry picked from commit `68668789b6`)	2025-09-08 18:02:43 +02:00
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