Release 1.2.61+1

Merge branch 'Release-1.2-V14' into 'release/1.2'
Release 1.2 V 14 See merge request r-d-technique/tiers/reflex-wms-connector!284
2026-06-30 10:47:19 +02:00 · 2026-06-29 15:07:26 +00:00 · 2026-06-29 17:02:39 +02:00 · 2026-06-29 15:56:58 +02:00 · 2026-06-29 15:56:52 +02:00 · 2026-06-25 13:56:51 +02:00
11 changed files with 24 additions and 24 deletions
--- a/ActorPrefix.ftl
+++ b/ActorPrefix.ftl
@@ -38,7 +38,7 @@
    <#local depot = actor>
  <#else>
    <#if actor?length gt 4>
-    <#local depot = actor[4..]>
+        <#local depot = actor[4..]>
    <#else>
        <#local depot = actor>
    </#if>
@@ -83,7 +83,7 @@
    <#local supplier = actor>
  <#else>
    <#if actor?length gt 4>
-    <#local supplier = actor[4..]>
+        <#local supplier = actor[4..]>
    <#else>
        <#local supplier = actor>
    </#if>
@@ -126,7 +126,7 @@
    <#local carrier = actor>
  <#else>
    <#if actor?length gt 4>
-    <#local carrier = actor[4..]>
+        <#local carrier = actor[4..]>
    <#else>
        <#local carrier = actor>
    </#if>
@@ -169,7 +169,7 @@
    <#local consignee = actor>
  <#else>
    <#if actor?length gt 4>
-    <#local consignee = actor[4..]>
+        <#local consignee = actor[4..]>
    <#else>
        <#local consignee = actor>
    </#if>
--- a/RFXtoRP_HsaDesPatch.ftl
+++ b/RFXtoRP_HsaDesPatch.ftl
@@ -17,7 +17,7 @@
      <#assign desPatch = JsonUtil.jsonToMap(dataRfx)>

      <#stop>
-      <#break>
+	  <#break>

    <#case "D">
      <#-- *********************************************** Action = DELETE ******************** -->
@@ -25,7 +25,7 @@
      <#assign desPatch = JsonUtil.jsonToMap(dataRfx)>

      <#stop>
-      <#break>
+	<#break>
    <#default>
          <#stop >
 </#switch>
--- a/RFXtoRP_HsaDespNt.ftl
+++ b/RFXtoRP_HsaDespNt.ftl
@@ -17,7 +17,7 @@
      <#assign despNt = JsonUtil.jsonToMap(dataRfx)>

      <#stop>
-      <#break>
+	<#break>

    <#case "D">
      <#-- *********************************************** Action = DELETE ******************** -->
@@ -25,7 +25,7 @@
      <#assign despNt = JsonUtil.jsonToMap(dataRfx)>

      <#stop>
-      <#break>
+	<#break>
    <#default>
          <#stop >
 </#switch>
--- a/RFXtoRP_HsrLoadInfo.ftl
+++ b/RFXtoRP_HsrLoadInfo.ftl
@@ -18,14 +18,14 @@
      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
       <#stop>
-      <#break>
+	<#break>

    <#case "D">
      <#-- *********************************************** Action = DELETE *************************** -->
        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
       <#stop>
-       <#break>
+	<#break>

    <#default>
          <#stop >
--- a/RFXtoRP_HsrPackBranch.ftl
+++ b/RFXtoRP_HsrPackBranch.ftl
@@ -17,7 +17,7 @@
      <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>

      <#stop>
-      <#break>
+	<#break>

    <#case "D">
      <#-- *********************************************** Action = DELETE ******************** -->
@@ -25,7 +25,7 @@
      <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>

      <#stop>
-      <#break>
+	<#break>
    <#default>
          <#stop >
 </#switch>
--- a/RFXtoRP_HsrPackOrder.ftl
+++ b/RFXtoRP_HsrPackOrder.ftl
@@ -17,7 +17,7 @@
      <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>

      <#stop>
-      <#break>
+	<#break>

    <#case "D">
      <#-- *********************************************** Action = DELETE ******************** -->
@@ -25,7 +25,7 @@
      <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>

      <#stop>
-      <#break>
+	<#break>
    <#default>
          <#stop >
 </#switch>
--- a/RFXtoRP_PlatformLogCreate.ftl
+++ b/RFXtoRP_PlatformLogCreate.ftl
@@ -27,7 +27,7 @@
 	      },
 	    "UserMessage": {
 	      "Code": "${restResponsetMsg.status!"no Code"}",
-	      "Label": ${strJsonBody?truncate(32000,'...'),
+	      "Label": ${strJsonBody?truncate(32000,'...')},
 	      "Params": []
 	    },
 	    "DetailElements": [],
--- 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>
 	[
 		<#if appointment?? && (!(appointment.WMSCreated??) ||  !appointment.WMSCreated) &&  appointment.Status?? && appointment.Status.Current?? && appointment.Status.Current.StatusCode?? && appointment.Status.Current.StatusCode == AppointmentStatusCode.APPOINTMENT_0150_ALLOCATION_ERROR>
 		{
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -37,15 +37,15 @@
 			"requested_delivery_start_datetime":  "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}",
 		</#if>
 		"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}"
 		  	}
--- 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-->
--- a/2
+++ b/2
@@ -1 +1 @@
-1.2.60+5
+1.2.61+1
Author	SHA1	Message	Date
Vincent LE MAÎTRE	8011a7f2ea	Release 1.2.61+1	2026-06-30 10:47:19 +02:00
Francis Reat	f829a02d98	Merge branch 'Release-1.2-V14' into 'release/1.2' Release 1.2 V 14 See merge request r-d-technique/tiers/reflex-wms-connector!284	2026-06-29 15:07:26 +00:00
Francis Reat	11c928e257	Merge branch 'develop-1.2' into Release-1.2-V14	2026-06-29 17:02:39 +02:00
Laurie Montant	7c9321002f	Merge branch 'develop-1.2' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop-1.2	2026-06-29 15:56:58 +02:00
Laurie Montant	d4e5910933	CMD	2026-06-29 15:56:52 +02:00
Francis Reat	65fca99577	SCPN1-10882 (cherry picked from commit `d380ec91f8`)	2026-06-25 13:56:51 +02:00
Francis Reat	89be22e1e1	Merge branch 'develop-1.2' into Release-1.2-V14 # Conflicts: # ActorPrefix.ftl # RFXtoRP_HsaDesPatch.ftl # RFXtoRP_HsaDespNt.ftl # RFXtoRP_HsrLoadInfo.ftl # RFXtoRP_HsrPackBranch.ftl # RFXtoRP_HsrPackOrder.ftl	2026-06-22 13:38:41 +02:00
Francis Reat	a4b5a1dbf0	SCPN1-10671	2026-05-12 18:00:59 +02:00
Francis Reat	5e3633aaa1	Release 1.2.60+6	2026-05-12 17:47:46 +02:00
Francis Reat	abe628a3b0	Merge branch 'release1.2-fix4-v13' into 'release/1.2' Fix4 v13 See merge request r-d-technique/tiers/reflex-wms-connector!282	2026-05-12 15:45:03 +00:00
Francis Reat	779b4d0596	Fix4 v13	2026-05-12 17:38:32 +02:00
Laurie Montant	e3f829683f	SCPN1-10706	2026-05-12 11:32:55 +02:00
Laurie Montant	2512bdda84	SCPN1-10765	2026-05-12 10:27:46 +02:00
Laurie Montant	9618f5bffb	SCPN1-10706	2026-05-12 10:14:53 +02:00
Laurie Montant	7563a1e932	SCPN1-10765	2026-05-11 17:26:42 +02:00
Laurie Montant	e73a2ccd83	SCPN1-10736	2026-05-05 14:11:06 +02:00
Laurie Montant	e75658e7ac	SCPN1-10736	2026-05-05 10:56:55 +02:00
Laurie Montant	e1981b8fbd	SCPN1-10671	2026-04-30 15:29:45 +02:00
Laurie Montant	285d5ff330	Merge branch 'develop-1.2' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop-1.2	2026-04-28 09:48:32 +02:00
Laurie Montant	51fdb6d382	SCPN1-10682	2026-04-28 09:48:27 +02:00
Francis Reat	d96c2c73c1	SCPN1-10671 (cherry picked from commit `9916545817`)	2026-04-27 10:47:28 +02:00
@@ -1 +1 @@
 .2.60+5
 .2.61+1