From 9fb02d617232b61aaf73459e3026d99980946797 Mon Sep 17 00:00:00 2001 From: Laurie CELLIER Date: Thu, 3 Sep 2026 13:46:09 +0000 Subject: [PATCH 1/4] SCPN1-11197 (cherry picked from commit edeb9db5b964cb61990b53b07d0bc8c9e9057fbe) Co-authored-by: Laurie Montant --- ...iptList_TransfertExecutionflowDetected.ftl | 93 +++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl index e972642..0c40edb 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl @@ -37,7 +37,18 @@ { "Key": "order_number", "Value": "${receipt.receipt_number}" + }, + <#if receipt.line_list[0]?? && receipt.line_list[0].line_anticipated?? && receipt.line_list[0].line_anticipated.anticipated_receipt_year!=0 && receipt.line_list[0].line_anticipated.anticipated_receipt_number!=0 > + { + "Key": "anticipated", + "Value": "true" } + <#else> + { + "Key": "anticipated", + "Value": "false" + } + ], <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" && receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", @@ -140,6 +151,47 @@ { "Header": {"ProjectID": "${projectRP}"}, "ID": { + "CustomFields": [ + { + "Key": "depot_code", + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + "Value": "${receipt.origin_order_line_depot?trim?json_string}" + <#else> + "Value": "${receipt.physical_depot_code?trim?json_string}" + + }, + { + "Key": "activity_code", + "Value": "${receipt.activity_code?trim?json_string}" + }, + { + "Key": "originator_code", + "Value": "${receipt.originator_code?trim?json_string}" + }, + { + "Key": "reference", + "Value": "${receipt.receipt_reference?trim?json_string}" + }, + { + "Key": "order_year", + "Value": "${receipt.receipt_year}" + }, + { + "Key": "order_number", + "Value": "${receipt.receipt_number}" + }, + <#if receipt.line_list[0]?? && receipt.line_list[0].line_anticipated?? && receipt.line_list[0].line_anticipated.anticipated_receipt_year!=0 && receipt.line_list[0].line_anticipated.anticipated_receipt_number!=0 > + { + "Key": "anticipated", + "Value": "true" + } + <#else> + { + "Key": "anticipated", + "Value": "false" + } + + ], <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}", <#else> @@ -226,6 +278,47 @@ { "Header": {"ProjectID": "${projectRP}"}, "ID": { + "CustomFields": [ + { + "Key": "depot_code", + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + "Value": "${receipt.origin_order_line_depot?trim?json_string}" + <#else> + "Value": "${receipt.physical_depot_code?trim?json_string}" + + }, + { + "Key": "activity_code", + "Value": "${receipt.activity_code?trim?json_string}" + }, + { + "Key": "originator_code", + "Value": "${receipt.originator_code?trim?json_string}" + }, + { + "Key": "reference", + "Value": "${receipt.receipt_reference?trim?json_string}" + }, + { + "Key": "order_year", + "Value": "${receipt.receipt_year}" + }, + { + "Key": "order_number", + "Value": "${receipt.receipt_number}" + }, + <#if receipt.line_list[0]?? && receipt.line_list[0].line_anticipated?? && receipt.line_list[0].line_anticipated.anticipated_receipt_year!=0 && receipt.line_list[0].line_anticipated.anticipated_receipt_number!=0 > + { + "Key": "anticipated", + "Value": "true" + } + <#else> + { + "Key": "anticipated", + "Value": "false" + } + + ], "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}", "RefDate": { "DateTime": "${receipt_creation_datetime}", From 16cec5e7e00e541009ea142e519862e557ccbb69 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Fri, 4 Sep 2026 15:26:03 +0200 Subject: [PATCH 2/4] Release 2.0.26+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index f1dbecd..2cb22f4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.25+4 +2.0.26+1 From adbd5180a4cabdee720341b158ffcea7e91e2a5f Mon Sep 17 00:00:00 2001 From: Vincent LEMAITRE Date: Fri, 4 Sep 2026 13:33:43 +0000 Subject: [PATCH 3/4] revert VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 2cb22f4..f1dbecd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.26+1 +2.0.25+4 From ea4df33d7a7aa192059d8ba652ceafe11af32eef Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Fri, 4 Sep 2026 15:35:08 +0200 Subject: [PATCH 4/4] Release 2.0.25+5 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index f1dbecd..42adf32 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.25+4 +2.0.25+5