Release 1.2.12+1

Release 1.2.11+1
Update VERSION to roolback to 1.2.10+2
2024-02-16 11:51:17 +01:00 · 2024-01-26 11:15:57 +01:00 · 2024-01-26 10:02:42 +00:00 · 2024-01-26 10:56:09 +01:00 · 2024-01-26 09:52:43 +00:00 · 2024-01-25 11:22:41 +01:00
10 changed files with 50 additions and 17 deletions
--- a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl
+++ b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl
@@ -25,7 +25,9 @@
         "ItemID": "${stock.item_code}",  
         "LVBranchID": "${stock.item_logistical_variant_code}",
         <#assign priority_date = stock.priority_date?datetime(rfx_date_format_default)?iso_utc /> 
-         "PriorityDate" : "${priority_date}",
+         <#if (stock.priority_date!="") && (stock.priority_date?starts_with("00")== false) >
+          "PriorityDate" : "${priority_date}",
+         </#if>
         
       <#-- Segmentation keys inclusion -->
       <#include "RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl">
--- a/RFXtoRP_HsaIpgMove.ftl
+++ b/RFXtoRP_HsaIpgMove.ftl
@@ -45,7 +45,7 @@
          >
         [
         {
-           <#assign apiReflexPlatformID = ApiReflexPlatformID.GoodsReceived> 
+           <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived> 
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :         
           <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
@@ -58,7 +58,7 @@
      </#if>
      </#if>
      <#else>
-      <#-- cases of an IPG move with quantity = 0 (weight modification))--> 
+      <#-- cases of an IPG move with quantity = 0 (weight modification)--> 
         <#stop "move ignored quantity = 0">
         </#if>
      <#break>
--- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl
@@ -33,36 +33,36 @@
           "ItemID": "${preparation_line.item_code}",
           "LVBranchID": "${preparation_line.item_lv_code}",
           <#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)>
-              <#--  <#assign priority_date = JsonUtil.createUTCDateTime(despatched_ipg.ipg_manufacture_date) /> --> 
              <#assign priority_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc />
              "PriorityDate": "${priority_date}",
             <#else>
            <#if (despatched_ipg.ipg_receipt_date?length != 0) && (despatched_ipg.ipg_receipt_date?starts_with("00")== false)>
-              <#--  <#assign priority_date = JsonUtil.createUTCDateTime(despatched_ipg.ipg_receipt_date) /> -->
              <#assign priority_date = despatched_ipg.ipg_receipt_date?datetime(rfx_date_format_default)?iso_utc />
              "PriorityDate": "${priority_date}",
             <#else>
             <#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)>
-              <#--  <#assign priority_date = JsonUtil.createUTCDateTime(despatched_ipg.ipg_best_before_date) /> -->
              <#assign priority_date = despatched_ipg.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc />
              "PriorityDate": "${priority_date}",
             <#else>
             <#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)>
-              <#--  <#assign priority_date = JsonUtil.createUTCDateTime(despatched_ipg.ipg_sell_by_date) /> -->
-              <#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
+               <#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
              "PriorityDate": "${priority_date}",
             <#else>
              <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
-              <#--  <#assign priority_date = JsonUtil.createUTCDateTime(despatched_ipg.ipg_use_by_date) /> -->
              <#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc /> 
              "PriorityDate": "${priority_date}",
+             <#else>
+			 <#if (preparationOrder.stock_despatch_at_preparation_datetime?length != 0) && (preparationOrder.stock_despatch_at_preparation_datetime?starts_with("00")== false)>
+              <#assign priority_date = preparationOrder.stock_despatch_at_preparation_datetime?datetime(rfx_date_format_default)?iso_utc /> 
+              "PriorityDate": "${priority_date}",
             <#else>
                "PriorityDate": "error_date",
          </#if>           
          </#if>           
          </#if>             
          </#if>           
-          </#if>          
+          </#if> 
+          </#if> 		  
       
       <#-- Segmentation Keys inclusion -->
       <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -67,13 +67,13 @@
 			"grade_code_to_prepare" :"${grade_code_to_prepare}",
 			"input_order_data": "false",
 			"batch_1": "${batch_1}",
+			"base_lv_quantity": "true",
 			"any_lv": "false"	
 			<#-- 
      		"stock_reservation": "false",
            "forced_priority_date_min_lead_time": "false",
            "temp_substitution_possible": "false",
-            "substitution_possible": "false",
-            "base_lv_quantity": "true",
+            "substitution_possible": "false"
 			-->
            
 		}<#sep>,</#sep>
--- a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl
+++ b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl
@@ -2,10 +2,18 @@

 <#-- How to use MD Header map
    Example : 
-    <#assign pick_sequence_code = Header_MetaData_Map["OrderType"]!""/>
+    <#assign pick_sequence_code = Header_MetaData_Map["OrderType"].String!""/>
+
+    If your MD is :
+        Boolean : .Bool
+        Float : .Float
+        Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone
+        Int : .Int
+        String : .String
 -->


+
 <#assign activity_code = ""/>
 <#assign originator_code = ""/>
 <#assign preparation_type_code = ""/>
--- a/RPtoRFX_PrepOrder_DefaultLineData.ftl
+++ b/RPtoRFX_PrepOrder_DefaultLineData.ftl
@@ -3,7 +3,14 @@

 <#-- How to use MD or SK map
    Example : 
-    <#assign owner_code_to_prepare = SegmentationKeys_Map["Owner"]!""/>
+    <#assign owner_code_to_prepare = SegmentationKeys_Map["Owner"].String!""/>
+
+    If your SK is :
+        Boolean : .Bool
+        Float : .Float
+        Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone
+        Int : .Int
+        String : .String
 -->

 <#assign owner_code_to_prepare = SegmentationKeys_Map["myOwner"]!""/>
--- a/RPtoRFX_Receipt_DefaultHeaderData.ftl
+++ b/RPtoRFX_Receipt_DefaultHeaderData.ftl
@@ -2,7 +2,14 @@

 <#-- How to use MD Header map
    Example : 
-    <#assign receipt_type = Header_MetaData_Map["OrderType"]!""/>
+    <#assign receipt_type = Header_MetaData_Map["OrderType"].String!""/>
+
+    If your MD is :
+        Boolean : .Bool
+        Float : .Float
+        Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone
+        Int : .Int
+        String : .String
 -->

 <#assign activity_code = ""/>
--- a/RPtoRFX_Receipt_DefaultLineData.ftl
+++ b/RPtoRFX_Receipt_DefaultLineData.ftl
@@ -3,7 +3,14 @@

 <#-- How to use MD or SK map
    Example : 
-    <#assign owner_code = SegmentationKeys_Map["Owner"]!""/>
+    <#assign owner_code = SegmentationKeys_Map["Owner"].String!""/>
+
+    If your SK is :
+        Boolean : .Bool
+        Float : .Float
+        Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone
+        Int : .Int
+        String : .String
 -->


--- a/ReflexUtils.ftl
+++ b/ReflexUtils.ftl
@@ -15,12 +15,14 @@
 <#function splitEmailsIntoArray emails >
 <#local str = "[">
 <#list emails?split(';|,| ',"r")?filter(l -> l != "") as email>
+<#if email?matches("^[\\w-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$")>
 <#if str != "[">		  
 <#local str += ",">
 </#if>
 <#local str += "\"">
 <#local str += email>
 <#local str += "\"">
+</#if>  
 </#list>
 <#local str += "]">
 <#return (str)>
--- a/2
+++ b/2
@@ -1 +1 @@
-1.2.9+1
+1.2.12+1
Author	SHA1	Message	Date
freat	892812e85e	Release 1.2.12+1	2024-02-16 11:51:17 +01:00
freat	a512e4c23a	Release 1.2.11+1	2024-01-26 11:15:57 +01:00
Francis Reat	884ad540fe	Update VERSION to roolback to 1.2.10+2	2024-01-26 10:02:42 +00:00
freat	3a9620e3ee	Release 1.2.2+1	2024-01-26 10:56:09 +01:00
Francis Reat	d5573b6dba	Merge branch 'SCPN-5764' into 'release/1.2' Modifs RPtoRFX 2301241050 See merge request r-d-technique/tiers/reflex-wms-connector!13	2024-01-26 09:52:43 +00:00
Laurie Montant	162b73e75f	Modifs RPtoRFX 2301241050 (cherry picked from commit `56cd76fe0e`)	2024-01-25 11:22:41 +01:00
Laurie Montant	bb4315bba1	SCPN1-5764	2024-01-25 11:13:44 +01:00
freat	c4910785e0	Release 1.2.10+2	2024-01-17 15:29:36 +01:00
Francis Reat	5688244be2	Update VERSION to roolback to 1.2.10+1	2024-01-17 13:34:06 +00:00
freat	de5e94be3c	Release 1.2.1+1	2024-01-17 13:58:26 +01:00
Francis Reat	646256d879	Merge branch 'SCPN1-5711' into 'release/1.2' SCPN1-5711 See merge request r-d-technique/tiers/reflex-wms-connector!12	2024-01-17 12:49:38 +00:00
frea	60355d1ba5	SCPN1-5711	2024-01-17 13:47:38 +01:00
freat	737763dc7f	Release 1.2.10+1	2024-01-17 10:16:31 +01:00
Francis Reat	098b2d4e1d	Merge branch 'SCPN1-5711' into 'release/1.2' Modifs RPtoRFX 1701240947 See merge request r-d-technique/tiers/reflex-wms-connector!10	2024-01-17 09:05:46 +00:00
Francis Reat	7b55a4bcd0	Merge branch 'cherry-pick-ca30958d' into 'SCPN1-5711' Modifs RPtoRFX 1701240947 See merge request r-d-technique/tiers/reflex-wms-connector!9	2024-01-17 09:02:23 +00:00
Laurie Montant	b369dd8adf	Modifs RPtoRFX 1701240947 (cherry picked from commit `ca30958d35`)	2024-01-17 09:02:01 +00:00
frea	fd1cfcc2c5	SCPN1-5711	2024-01-17 10:00:31 +01:00
@@ -1 +1 @@
 .2.9+1
 .2.12+1