From d96c2c73c1f38ffcd6c41fc1a4e3111f42125e89 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Mon, 27 Apr 2026 10:47:03 +0200 Subject: [PATCH 01/12] SCPN1-10671 (cherry picked from commit 9916545817523e30a526484e4f3f622d767e24c5) --- RFXtoRP_PlatformLogCreate.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_PlatformLogCreate.ftl b/RFXtoRP_PlatformLogCreate.ftl index 953c214..ea30d9f 100644 --- a/RFXtoRP_PlatformLogCreate.ftl +++ b/RFXtoRP_PlatformLogCreate.ftl @@ -23,16 +23,16 @@ }, "TechMessage": { "Code": "${restResponsetMsg.status!"no Code"}", - "Label": ${strJsonBody} + "Label": ${strJsonBody?truncate(32000,'...')} }, "UserMessage": { "Code": "${restResponsetMsg.status!"no Code"}", - "Label": ${strJsonBody}, + "Label": ${strJsonBody?truncate(32000,'...'), "Params": [] }, "DetailElements": [], "CorrelationID": "${id.correlationid!"no Correlationid"}", - "ContextPayload": ${strJsonBody}, + "ContextPayload": ${strJsonBody?truncate(32000,'...')}, "Type": "${event}", "Task": "${id.apiRestReflexID!"no Task"}", "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}", From 51fdb6d38250095825f9d31d1cfc9d52e3e4bb1a Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 28 Apr 2026 09:48:27 +0200 Subject: [PATCH 02/12] SCPN1-10682 --- RFXtoRP_HsrCarrierApt_CarrierExpected.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrCarrierApt_CarrierExpected.ftl b/RFXtoRP_HsrCarrierApt_CarrierExpected.ftl index b5df356..4efcc3e 100644 --- a/RFXtoRP_HsrCarrierApt_CarrierExpected.ftl +++ b/RFXtoRP_HsrCarrierApt_CarrierExpected.ftl @@ -1,5 +1,5 @@ [ - <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.creation_datetime,time_zone_rfx) /> + <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.last_update_datetime,time_zone_rfx) /> <#assign ref_datetime2 = AddSecondsToDatetime(ref_datetime?datetime.iso, 60)?iso_utc /> { "Header": { From e1981b8fbd229637591c55024060d25f66359d35 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 30 Apr 2026 15:29:45 +0200 Subject: [PATCH 03/12] SCPN1-10671 --- RPtoRFX_PrepOrder.ftl | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index 3bbf34c..64d66b8 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -11,7 +11,11 @@ <#-- If you are using unreferenced actors, you will need to create a "VIZ" consignee in HARDIS WMS to use this feature --> <#assign defaultactor ="VIZ"> <#if executionflow.ShipTo.ActorID?? && executionflow.ShipTo.ActorID!=""> - <#assign actorID = "${RPtoRFXprefixConsignee(executionflow.ShipTo.ActorID)}" > + <#if (executionflow.ShipTo.ActorID?length gt 4) > + <#assign actorID = "${RPtoRFXprefixConsignee(executionflow.ShipTo.ActorID)}" > + <#else> + <#assign actorID = "${executionflow.ShipTo.ActorID}" > + <#else> <#assign actorID = defaultactor > @@ -22,7 +26,11 @@ "method" : "POST", "uri_substitutions": { "activity_code": "${activity_code}", - "physical_depot_code": "${RPtoRFXprefixDepot(executionflow.ShipFrom.ActorID)}", + <#if (executionflow.ShipFrom.ActorID?length gt 4) > + "physical_depot_code": "${RPtoRFXprefixDepot(executionflow.ShipFrom.ActorID)}", + <#else> + "physical_depot_code": "${executionflow.ShipFrom.ActorID}", + "originator_code": "${originator_code}" }, "payload" : From e75658e7ace5aec43cf01d35c809e0f6c854dd7c Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 5 May 2026 10:56:55 +0200 Subject: [PATCH 04/12] SCPN1-10736 --- RFXtoRP_HsrCarrierApt_CarrierExpected.ftl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/RFXtoRP_HsrCarrierApt_CarrierExpected.ftl b/RFXtoRP_HsrCarrierApt_CarrierExpected.ftl index 4efcc3e..7284ee7 100644 --- a/RFXtoRP_HsrCarrierApt_CarrierExpected.ftl +++ b/RFXtoRP_HsrCarrierApt_CarrierExpected.ftl @@ -1,6 +1,5 @@ [ <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.last_update_datetime,time_zone_rfx) /> - <#assign ref_datetime2 = AddSecondsToDatetime(ref_datetime?datetime.iso, 60)?iso_utc /> { "Header": { "ProjectID": "${projectRP}" @@ -20,7 +19,7 @@ "RefDate": { - "DateTime": "${ref_datetime2}", + "DateTime": "${ref_datetime}", "AuthorTimeZone": "${time_zone_rfx}" } }, From e73a2ccd83fce44150b6db5a26f9715164a885aa Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 5 May 2026 14:11:06 +0200 Subject: [PATCH 05/12] SCPN1-10736 --- RFXtoRP_HsaLstCarSta_CarrierExpected.ftl | 3 ++- RFXtoRP_HsrCarrierApt_CarrierExpected.ftl | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl b/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl index 4fe7837..424c2ef 100644 --- a/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl +++ b/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl @@ -1,5 +1,6 @@ [ <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt_status.status.creation_datetime,time_zone_rfx) /> + <#assign ref_datetime2 = AddSecondsToDatetime(ref_datetime?datetime.iso, 1)?iso_utc /> { "Header": { "ProjectID": "${projectRP}" @@ -19,7 +20,7 @@ "RefDate": { - "DateTime": "${ref_datetime}", + "DateTime": "${ref_datetime2}", "AuthorTimeZone": "${time_zone_rfx}" } }, diff --git a/RFXtoRP_HsrCarrierApt_CarrierExpected.ftl b/RFXtoRP_HsrCarrierApt_CarrierExpected.ftl index 7284ee7..dbb8910 100644 --- a/RFXtoRP_HsrCarrierApt_CarrierExpected.ftl +++ b/RFXtoRP_HsrCarrierApt_CarrierExpected.ftl @@ -1,5 +1,6 @@ [ <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.last_update_datetime,time_zone_rfx) /> + <#assign ref_datetime2 = AddSecondsToDatetime(ref_datetime?datetime.iso, 1)?iso_utc /> { "Header": { "ProjectID": "${projectRP}" @@ -19,7 +20,7 @@ "RefDate": { - "DateTime": "${ref_datetime}", + "DateTime": "${ref_datetime2}", "AuthorTimeZone": "${time_zone_rfx}" } }, From 7563a1e932d9ae86c79b383076c8d3bbd75da3e4 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 11 May 2026 17:26:42 +0200 Subject: [PATCH 06/12] SCPN1-10765 --- RFXtoRP_HfGrade.ftl | 2 +- RFXtoRP_HfLvTypeList.ftl | 4 +--- RFXtoRP_HfOwner.ftl | 2 +- RFXtoRP_HsaDesPatch.ftl | 8 ++++---- RFXtoRP_HsaDespNt.ftl | 8 ++++---- RFXtoRP_HsaIpgMove_StockMoved.ftl | 2 +- RFXtoRP_HsrLoadInfo.ftl | 16 ++++------------ RFXtoRP_HsrPackBranch.ftl | 8 ++++---- RFXtoRP_HsrPackOrder.ftl | 8 ++++---- 9 files changed, 24 insertions(+), 34 deletions(-) diff --git a/RFXtoRP_HfGrade.ftl b/RFXtoRP_HfGrade.ftl index 39f6d2f..5d33f00 100644 --- a/RFXtoRP_HfGrade.ftl +++ b/RFXtoRP_HfGrade.ftl @@ -9,7 +9,7 @@ <#case "C"> <#case "U"> <#case "D"> - <#stop "no generic FTL file available yet for Grades"> + <#stop> <#break> diff --git a/RFXtoRP_HfLvTypeList.ftl b/RFXtoRP_HfLvTypeList.ftl index f9b3b04..8a15c6f 100644 --- a/RFXtoRP_HfLvTypeList.ftl +++ b/RFXtoRP_HfLvTypeList.ftl @@ -9,9 +9,7 @@ <#case "C"> <#case "U"> <#case "D"> - - <#stop "no generic FTL file available yet for LV types"> - + <#stop> <#break> diff --git a/RFXtoRP_HfOwner.ftl b/RFXtoRP_HfOwner.ftl index 6d23fd2..8a15c6f 100644 --- a/RFXtoRP_HfOwner.ftl +++ b/RFXtoRP_HfOwner.ftl @@ -9,7 +9,7 @@ <#case "C"> <#case "U"> <#case "D"> - <#stop "no generic FTL file available yet for Owners"> + <#stop> <#break> diff --git a/RFXtoRP_HsaDesPatch.ftl b/RFXtoRP_HsaDesPatch.ftl index 202981f..63a0b4e 100644 --- a/RFXtoRP_HsaDesPatch.ftl +++ b/RFXtoRP_HsaDesPatch.ftl @@ -16,16 +16,16 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign desPatch = JsonUtil.jsonToMap(dataRfx)> - <#stop "no generic FTL file available yet for desPatch"> - <#break> + <#stop> + <#break> <#case "D"> <#-- *********************************************** Action = DELETE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign desPatch = JsonUtil.jsonToMap(dataRfx)> - <#stop "no generic FTL file available yet for desPatch"> - <#break> + <#stop> + <#break> <#default> <#stop > diff --git a/RFXtoRP_HsaDespNt.ftl b/RFXtoRP_HsaDespNt.ftl index da1d0c2..f385bfd 100644 --- a/RFXtoRP_HsaDespNt.ftl +++ b/RFXtoRP_HsaDespNt.ftl @@ -16,16 +16,16 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign despNt = JsonUtil.jsonToMap(dataRfx)> - <#stop "no generic FTL file available yet for despNt"> - <#break> + <#stop> + <#break> <#case "D"> <#-- *********************************************** Action = DELETE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign despNt = JsonUtil.jsonToMap(dataRfx)> - <#stop "no generic FTL file available yet for despNt"> - <#break> + <#stop> + <#break> <#default> <#stop > diff --git a/RFXtoRP_HsaIpgMove_StockMoved.ftl b/RFXtoRP_HsaIpgMove_StockMoved.ftl index 1be2932..7fb0837 100644 --- a/RFXtoRP_HsaIpgMove_StockMoved.ftl +++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl @@ -60,7 +60,7 @@ "ExternalInfo" : "${reflexMvtStockInterface.stock_move_reference?json_string}", <#if reflexMvtStockInterface.ipg_move_operation_year_number!= 0> - "OperationReference": "${reflexMvtStockInterface.ipg_move_operation_year_number} - ${reflexMvtStockInterface.ipg_move_operation_number}", + "OperationReference": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}-${reflexMvtStockInterface.ipg_move_operation_year_number} - ${reflexMvtStockInterface.ipg_move_operation_number}", "Quantity": diff --git a/RFXtoRP_HsrLoadInfo.ftl b/RFXtoRP_HsrLoadInfo.ftl index 1e7ac8c..f4a6010 100644 --- a/RFXtoRP_HsrLoadInfo.ftl +++ b/RFXtoRP_HsrLoadInfo.ftl @@ -17,23 +17,15 @@ <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign depot = JsonUtil.jsonToMap(dataRfx)> - [ - { - - } - ] - <#break> + <#stop> + <#break> <#case "D"> <#-- *********************************************** Action = DELETE *************************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign depot = JsonUtil.jsonToMap(dataRfx)> - [ - { - - } - ] - <#break> + <#stop> + <#break> <#default> <#stop > diff --git a/RFXtoRP_HsrPackBranch.ftl b/RFXtoRP_HsrPackBranch.ftl index f0f360e..d0a3e31 100644 --- a/RFXtoRP_HsrPackBranch.ftl +++ b/RFXtoRP_HsrPackBranch.ftl @@ -16,16 +16,16 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign packBranch = JsonUtil.jsonToMap(dataRfx)> - <#stop "no generic FTL file available yet for Pack Branch"> - <#break> + <#stop> + <#break> <#case "D"> <#-- *********************************************** Action = DELETE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign packBranch = JsonUtil.jsonToMap(dataRfx)> - <#stop "no generic FTL file available yet for Pack Branch"> - <#break> + <#stop> + <#break> <#default> <#stop > diff --git a/RFXtoRP_HsrPackOrder.ftl b/RFXtoRP_HsrPackOrder.ftl index 63a612d..6a5dff8 100644 --- a/RFXtoRP_HsrPackOrder.ftl +++ b/RFXtoRP_HsrPackOrder.ftl @@ -16,16 +16,16 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign packOrder = JsonUtil.jsonToMap(dataRfx)> - <#stop "no generic FTL file available yet for Pack Order"> - <#break> + <#stop> + <#break> <#case "D"> <#-- *********************************************** Action = DELETE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign packOrder = JsonUtil.jsonToMap(dataRfx)> - <#stop "no generic FTL file available yet for Pack Order"> - <#break> + <#stop> + <#break> <#default> <#stop > From 9618f5bffb3cdd46e173869ff6668e193e9adca1 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 12 May 2026 10:14:53 +0200 Subject: [PATCH 07/12] SCPN1-10706 --- ActorPrefix.ftl | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/ActorPrefix.ftl b/ActorPrefix.ftl index e12b76d..d995203 100644 --- a/ActorPrefix.ftl +++ b/ActorPrefix.ftl @@ -37,7 +37,11 @@ <#if uniqueness> <#local depot = actor> <#else> - <#local depot = actor[4..]> + <#if actor?length gt 4> + <#local depot = actor[4..]> + <#else> + <#local depot = actor> + <#return (depot)> @@ -78,7 +82,11 @@ <#if uniqueness> <#local supplier = actor> <#else> - <#local supplier = actor[4..]> + <#if actor?length gt 4> + <#local supplier = actor[4..]> + <#else> + <#local supplier = actor> + <#return (supplier)> @@ -117,7 +125,11 @@ <#if uniqueness> <#local carrier = actor> <#else> - <#local carrier = actor[4..]> + <#if actor?length gt 4> + <#local carrier = actor[4..]> + <#else> + <#local carrier = actor> + <#return (carrier)> @@ -156,7 +168,11 @@ <#if uniqueness> <#local consignee = actor> <#else> - <#local consignee = actor[4..]> + <#if actor?length gt 4> + <#local consignee = actor[4..]> + <#else> + <#local consignee = actor> + <#return (consignee)> \ No newline at end of file From 2512bdda84720ef856b47b640662a233e5395e55 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 12 May 2026 10:27:46 +0200 Subject: [PATCH 08/12] SCPN1-10765 --- RFXtoRP_HsaIpgMove_StockMoved.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaIpgMove_StockMoved.ftl b/RFXtoRP_HsaIpgMove_StockMoved.ftl index 7fb0837..cf652f0 100644 --- a/RFXtoRP_HsaIpgMove_StockMoved.ftl +++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl @@ -60,7 +60,7 @@ "ExternalInfo" : "${reflexMvtStockInterface.stock_move_reference?json_string}", <#if reflexMvtStockInterface.ipg_move_operation_year_number!= 0> - "OperationReference": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}-${reflexMvtStockInterface.ipg_move_operation_year_number} - ${reflexMvtStockInterface.ipg_move_operation_number}", + "OperationReference": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}-${reflexMvtStockInterface.ipg_move_operation_year_number}-${reflexMvtStockInterface.ipg_move_operation_number}", "Quantity": From e3f829683f2bb02409c475ad74b0be8ba5ffa778 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 12 May 2026 11:32:55 +0200 Subject: [PATCH 09/12] SCPN1-10706 --- RPtoRFX_PrepOrder.ftl | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index 64d66b8..3bbf34c 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -11,11 +11,7 @@ <#-- If you are using unreferenced actors, you will need to create a "VIZ" consignee in HARDIS WMS to use this feature --> <#assign defaultactor ="VIZ"> <#if executionflow.ShipTo.ActorID?? && executionflow.ShipTo.ActorID!=""> - <#if (executionflow.ShipTo.ActorID?length gt 4) > - <#assign actorID = "${RPtoRFXprefixConsignee(executionflow.ShipTo.ActorID)}" > - <#else> - <#assign actorID = "${executionflow.ShipTo.ActorID}" > - + <#assign actorID = "${RPtoRFXprefixConsignee(executionflow.ShipTo.ActorID)}" > <#else> <#assign actorID = defaultactor > @@ -26,11 +22,7 @@ "method" : "POST", "uri_substitutions": { "activity_code": "${activity_code}", - <#if (executionflow.ShipFrom.ActorID?length gt 4) > - "physical_depot_code": "${RPtoRFXprefixDepot(executionflow.ShipFrom.ActorID)}", - <#else> - "physical_depot_code": "${executionflow.ShipFrom.ActorID}", - + "physical_depot_code": "${RPtoRFXprefixDepot(executionflow.ShipFrom.ActorID)}", "originator_code": "${originator_code}" }, "payload" : From a4b5a1dbf0f7488bfe1be371afe2182f6cece9ba Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Tue, 12 May 2026 15:45:03 +0000 Subject: [PATCH 10/12] SCPN1-10671 --- RFXtoRP_PlatformLogCreate.ftl | 82 +++++++++++++++++------------------ 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/RFXtoRP_PlatformLogCreate.ftl b/RFXtoRP_PlatformLogCreate.ftl index ea30d9f..ffa5985 100644 --- a/RFXtoRP_PlatformLogCreate.ftl +++ b/RFXtoRP_PlatformLogCreate.ftl @@ -1,42 +1,42 @@ -<#include "HfRpConfig.ftl"> -[ - <#assign UUID = UUID.randomUUID()> - <#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)> - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID": { - "RefID": "${UUID}", - "RefDate": { - "DateTime": "${aDateTime?iso_utc}", - "AuthorTimeZone": "${time_zone_rfx}" - } - }, - "Payload": { - <#assign severity = SeverityLevel.ERROR> - "Severity": "${severity}", - "Namespace": "ReflexIntegration", - "DateTime": { - "DateTime": "${aDateTime?iso_utc}", - "AuthorTimeZone": "${time_zone_rfx}" - }, - "TechMessage": { - "Code": "${restResponsetMsg.status!"no Code"}", - "Label": ${strJsonBody?truncate(32000,'...')} - }, - "UserMessage": { - "Code": "${restResponsetMsg.status!"no Code"}", - "Label": ${strJsonBody?truncate(32000,'...'), - "Params": [] - }, - "DetailElements": [], - "CorrelationID": "${id.correlationid!"no Correlationid"}", - "ContextPayload": ${strJsonBody?truncate(32000,'...')}, - "Type": "${event}", - "Task": "${id.apiRestReflexID!"no Task"}", - "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}", - "StackTrace": "" - } - } +<#include "HfRpConfig.ftl"> +[ + <#assign UUID = UUID.randomUUID()> + <#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)> + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + "RefID": "${UUID}", + "RefDate": { + "DateTime": "${aDateTime?iso_utc}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + <#assign severity = SeverityLevel.ERROR> + "Severity": "${severity}", + "Namespace": "ReflexIntegration", + "DateTime": { + "DateTime": "${aDateTime?iso_utc}", + "AuthorTimeZone": "${time_zone_rfx}" + }, + "TechMessage": { + "Code": "${restResponsetMsg.status!"no Code"}", + "Label": ${strJsonBody?truncate(32000,'...')} + }, + "UserMessage": { + "Code": "${restResponsetMsg.status!"no Code"}", + "Label": ${strJsonBody?truncate(32000,'...')}, + "Params": [] + }, + "DetailElements": [], + "CorrelationID": "${id.correlationid!"no Correlationid"}", + "ContextPayload": ${strJsonBody?truncate(32000,'...')}, + "Type": "${event}", + "Task": "${id.apiRestReflexID!"no Task"}", + "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}", + "StackTrace": "" + } + } ] \ No newline at end of file From 65fca995775f0eb11f9bd14c9a75c5b5c8588076 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Thu, 25 Jun 2026 13:56:36 +0200 Subject: [PATCH 11/12] SCPN1-10882 (cherry picked from commit d380ec91f830648532f69e9c1c41fa14db652d92) --- RPtoRFX_AppointmentEvent.ftl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl index 4dbf993..343103b 100644 --- a/RPtoRFX_AppointmentEvent.ftl +++ b/RPtoRFX_AppointmentEvent.ftl @@ -27,6 +27,10 @@ <#case "Updated"> <#assign AddComma = false /> <#assign appointment = eventRP.data /> + + <#if !eventRP.commissionsUpdated!false && !eventRP.reasonUpdated!false && !eventRP.slotUpdated!false && !eventRP.carrierInformationUpdated!false> + <#stop> + [ <#if appointment?? && (!(appointment.WMSCreated??) || !appointment.WMSCreated) && appointment.Status?? && appointment.Status.Current?? && appointment.Status.Current.StatusCode?? && appointment.Status.Current.StatusCode == AppointmentStatusCode.APPOINTMENT_0150_ALLOCATION_ERROR> { From d4e5910933d22ee4bc0956fb9599ce4b2761dd9c Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 29 Jun 2026 15:56:52 +0200 Subject: [PATCH 12/12] CMD --- RPtoRFX_PrepOrder.ftl | 8 ++++---- RPtoRFX_PrepOrder_DefaultHeaderData.ftl | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index 3bbf34c..239662e 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -37,15 +37,15 @@ "requested_delivery_start_datetime": "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}", "requested_delivery_date_type": "${requested_delivery_date_type}", - "consolidated_delivery": "${consolidated_delivery_flag}", + "consolidated_delivery": "false", "pick_sequence_code": "${pick_sequence_code}", "intermediate_consignee": "false", - "protected": "${protected_flag}", - "automatic_generation": "${automatic_generation_flag}", + "protected": "false", + "automatic_generation": "true", "deactivate": "false", "optional_attributes": { <#include "RPtoRFX_PrepOrder_OptionalAttributes.ftl"> - "apt_with_end_consignee": "${apt_with_end_consignee_flag}", + "apt_with_end_consignee": "false", "apt_with_intermediate": "false", "load_grouping": "${load_grouping}" } diff --git a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl index 6d51468..d675f0a 100644 --- a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl +++ b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl @@ -18,11 +18,7 @@ <#assign originator_code = ""/> <#assign preparation_type_code = ""/> <#assign requested_delivery_date_type = ""/> -<#assign consolidated_delivery_flag ="false"/> <#assign pick_sequence_code = ""/> -<#assign protected_flag ="false"/> -<#assign automatic_generation_flag ="false"/> -<#assign apt_with_end_consignee_flag="false"/> <#-- A supprimer si utilisation de la table de correspondance--> <#--To be deleted if using the correspondence table-->