Release 2.0.25+7

Merge branch 'SCPN1-11443_2.0' into 'release/2.0'
SCPN1-11443_2.0 See merge request r-d-technique/tiers/reflex-wms-connector!319
2026-10-23 12:04:59 +02:00 · 2026-10-23 09:49:15 +00:00 · 2026-10-22 15:29:06 +00:00 · 2026-09-17 14:43:36 +02:00 · 2026-09-17 11:57:05 +00:00 · 2026-09-16 15:53:50 +02:00
5 changed files with 98 additions and 4 deletions
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -34,7 +34,7 @@
                "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 >
+            <#if receipt.line_list?? && 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"
@@ -74,7 +74,7 @@
         "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
      },
      "ShipToAcked": true,
-      <#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_reference?? && receipt.line_list[0].line_anticipated.anticipated_receipt_reference=="" >
+      <#if receipt.line_list?? && 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_reference?? && receipt.line_list[0].line_anticipated.anticipated_receipt_reference=="" >
        "OrderID":"AR-${receipt.line_list[0].line_anticipated.anticipated_receipt_depot_code?trim?json_string}${receipt.line_list[0].line_anticipated.anticipated_receipt_activity_code?trim?json_string}${receipt.line_list[0].line_anticipated.anticipated_receipt_originator_code?trim?json_string}${receipt.line_list[0].line_anticipated.anticipated_receipt_year}${receipt.line_list[0].line_anticipated.anticipated_receipt_number}",
      <#else>
        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
--- 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?? && 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>
        ],
          <#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}"
+                </#if>
+            },
+            {
+                "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?? && 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>
+          ],
              <#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}"
+                </#if>
+            },
+            {
+                "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?? && 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>
+        ],
                  "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}",
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -41,7 +41,7 @@
 		"pick_sequence_code": "${pick_sequence_code}",
 		"intermediate_consignee": "false",
 		"protected": "false",
-        "automatic_generation": "true",
+        "automatic_generation": "${automatic_generation_flag}",
 		"deactivate": "false",
 		"optional_attributes": {
 			<#include "RPtoRFX_PrepOrder_OptionalAttributes.ftl">
--- a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl
+++ b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl
@@ -19,6 +19,7 @@
 <#assign preparation_type_code = "010"/>
 <#assign requested_delivery_date_type = "010"/>
 <#assign pick_sequence_code = ""/>
+<#assign automatic_generation_flag = ""/>

 <#-- A supprimer si utilisation de la table de correspondance-->
 <#--To be deleted if using the correspondence table-->
--- a/2
+++ b/2
@@ -1 +1 @@
-2.0.25+4
+2.0.25+7
Author	SHA1	Message	Date
Cedric Rodier	a58faa3397	Release 2.0.25+7	2026-10-23 12:04:59 +02:00
Cedric Rodier	f5683e87ec	Merge branch 'SCPN1-11443_2.0' into 'release/2.0' SCPN1-11443_2.0 See merge request r-d-technique/tiers/reflex-wms-connector!319	2026-10-23 09:49:15 +00:00
Laurie CELLIER	b958d9f02c	SCPN1-11443 (cherry picked from commit 94ff53a63794cfbf682f98489664f5fbdb579375) Co-authored-by: Laurie Montant <laurie.montant@hardis-group.com>	2026-10-22 15:29:06 +00:00
cyril.scandaliato	3b66a99db3	Release 2.0.25+6	2026-09-17 14:43:36 +02:00
Francis Reat	b74d459abe	Merge branch 'release-2.0--SCPN1-11254' into 'release/2.0' Resolve SCPN1-11254 "Release 2.0 " See merge request r-d-technique/tiers/reflex-wms-connector!315	2026-09-17 11:57:05 +00:00
Francis Reat	89c00a2466	SCPN1-11254	2026-09-16 15:53:50 +02:00
Francis Reat	bb5b2c8c64	SCPN1-11254	2026-09-16 15:46:03 +02:00
Francis Reat	ea4df33d7a	Release 2.0.25+5	2026-09-04 15:35:08 +02:00
Vincent LEMAITRE	adbd5180a4	revert VERSION	2026-09-04 13:33:43 +00:00
Francis Reat	16cec5e7e0	Release 2.0.26+1	2026-09-04 15:26:03 +02:00
Francis Reat	9888046050	Merge branch 'release2.0-SCPN1-11197' into 'release/2.0' SCPN1-11197 See merge request r-d-technique/tiers/reflex-wms-connector!311	2026-09-04 09:32:51 +00:00
Laurie CELLIER	9fb02d6172	SCPN1-11197 (cherry picked from commit edeb9db5b964cb61990b53b07d0bc8c9e9057fbe) Co-authored-by: Laurie Montant <laurie.montant@hardis-group.com>	2026-09-03 13:46:09 +00:00
@@ -1 +1 @@
 .0.25+4
 .0.25+7