Merge branch 'release/1.2' into 'main-1.2'

release/1.2 into main-1.2

See merge request r-d-technique/tiers/reflex-wms-connector!225
This commit is contained in:
Francis REAT 2026-01-14 08:27:42 +00:00
commit dc52629304
2 changed files with 4 additions and 4 deletions

View File

@ -149,10 +149,10 @@
<#if preparationOrderPostResponse.status?? && (preparationOrderPostResponse.status == "SUCCESS" || preparationOrderPostResponse.status == "WARN") >
[
{
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipToAcked>
"apiReflexPlatformID" : "${apiReflexPlatformID}",
"datas" :
<#include "RFXtoRP_Receipt_ExecutionflowDeleted.ftl">
<#include "RFXtoRP_Receipt_ShipToAcked.ftl">
}
]
<#else>
@ -419,7 +419,7 @@
]
</#switch>
<#break>
<#-- *********************************************** ApiRestID = appointment_post_physical_receipt_associations ******************** -->
<#-- *********************************************** ApiRestID = appointment_post_physical_receipt_associations/dissociations ******************** -->
<#case "appointment_post_physical_receipt_associations_by_ref">
<#case "appointment_post_physical_receipt_associations_by_number">
<#case "appointment_post_physical_receipt_dissociations_by_ref">

View File

@ -1 +1 @@
1.2.54+2
1.2.54+3