From 0d162d5de25c740da08260dec01efaba599360c0 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 8 Sep 2025 09:45:36 +0200 Subject: [PATCH 1/4] Correction 080925 (cherry picked from commit 0ad605af1d252d3b15ac8bb736adc9141fa8b84f) --- RFXtoRP_HsaItm_ItemCreated.ftl | 2 +- RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl | 2 +- RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/RFXtoRP_HsaItm_ItemCreated.ftl b/RFXtoRP_HsaItm_ItemCreated.ftl index c2d33a9..1f22d6b 100644 --- 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> { diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index ee94331..4412001 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -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}" diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl index ee94331..4412001 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl @@ -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}" diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl index ee94331..4412001 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -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}" From efe3ac2134e53247899e187e00ca45262561797c Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 8 Sep 2025 09:57:24 +0200 Subject: [PATCH 2/4] Corrections 250908 (cherry picked from commit 17830c1c6e8a82f68b825882699e7ab1dc5d91e8) --- RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl | 4 ++-- RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl | 4 ++-- RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index 4412001..1c838f8 100644 --- 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.receipt_reference?trim?json_string}", + "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl index 4412001..1c838f8 100644 --- 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.receipt_reference?trim?json_string}", + "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl index 4412001..1c838f8 100644 --- 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.receipt_reference?trim?json_string}", + "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" From 18c4959a62118937c524a89d6d5b8bd1141d298d Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 8 Sep 2025 09:45:36 +0200 Subject: [PATCH 3/4] Correction 080925 (cherry picked from commit 0ad605af1d252d3b15ac8bb736adc9141fa8b84f) --- RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl | 2 +- RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index 1c838f8..2d0e40f 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -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}" diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl index 1c838f8..2d0e40f 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl @@ -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}" diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl index 1c838f8..2d0e40f 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -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}" From 6d6a56710b62c62e62077c839ca6b7c25a855289 Mon Sep 17 00:00:00 2001 From: frea Date: Mon, 8 Sep 2025 10:42:36 +0200 Subject: [PATCH 4/4] Release 1.2.44+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index fa18b53..4981dfc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.44+1 +1.2.44+2