Release 1.2.12+3

Merge branch 'SCPN1-6093' into 'release/1.2'
SCPN1-6093 See merge request r-d-technique/tiers/reflex-wms-connector!18
2024-02-29 15:35:54 +01:00 · 2024-02-29 14:35:25 +00:00 · 2024-02-29 15:32:01 +01:00 · 2024-02-29 14:51:31 +01:00 · 2024-02-29 13:30:33 +00:00 · 2024-02-29 14:16:53 +01:00
44 changed files with 225 additions and 143 deletions
--- a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl
+++ b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl
@@ -22,10 +22,12 @@
       },
       
       "Goods": {
-         "ItemID": "${stock.item_code}",  
+         "ItemID": "${stock.item_code?trim?json_string}",
         "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_HfExpGrpList.ftl
+++ b/RFXtoRP_HfExpGrpList.ftl
@@ -24,5 +24,5 @@ ${output}
 			<#break>
 			
 	  <#default>
-	        <#stop>
+	        <#stop >
 </#switch>
--- a/RFXtoRP_HfLvTypeList.ftl
+++ b/RFXtoRP_HfLvTypeList.ftl
@@ -9,7 +9,9 @@
 	<#case "C">
 	<#case "U">
 	<#case "D">
+
 		<#stop "no generic FTL file available yet for LV types">	
+
 	<#break>
 	        
 	    
--- a/RFXtoRP_HsaCarrier_ActorCreated.ftl
+++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl
@@ -4,7 +4,7 @@
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-      "RefID": "${carrier.carrier_code}"
+      "RefID": "${carrier.carrier_code?trim?json_string}"
    },
    
    "Payload": {
--- a/RFXtoRP_HsaCarrier_ActorDeleted.ftl
+++ b/RFXtoRP_HsaCarrier_ActorDeleted.ftl
@@ -4,7 +4,7 @@
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-      "RefID": "${carrier.carrier_code}"
+      "RefID": "${carrier.carrier_code?trim?json_string}"
    },
    
    "Payload": {}
--- a/RFXtoRP_HsaCons_ActorCreated.ftl
+++ b/RFXtoRP_HsaCons_ActorCreated.ftl
@@ -4,7 +4,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${actor.code}"
+      "RefID": "${actor.code?trim?json_string}"
    },

    "Payload": {
--- a/RFXtoRP_HsaCons_ActorDeleted.ftl
+++ b/RFXtoRP_HsaCons_ActorDeleted.ftl
@@ -4,7 +4,7 @@
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-      "RefID": "${actor.code}"
+      "RefID": "${actor.code?trim?json_string}"
    },
  
    "Payload": {}
--- a/RFXtoRP_HsaIpgMove.ftl
+++ b/RFXtoRP_HsaIpgMove.ftl
@@ -45,21 +45,20 @@
          >
         [
         {
-           <#assign apiReflexPlatformID = ApiReflexPlatformID.GoodsReceived> 
+           <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived> 
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :         
           <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
-              
         }
         ]  
      <#else>  
      <#-- Case of IPG move type volontarilly ignored-->         
-         <#stop "Move type not supported">  
+               <#stop>
      </#if>
      </#if>
      <#else>
-      <#-- cases of an IPG move with quantity = 0 (weight modification))--> 
-         <#stop "move ignored quantity = 0">
+      <#-- cases of an IPG move with quantity = 0 (weight modification)--> 
+         <#stop>
         </#if>
      <#break>
      
--- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
+++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
@@ -8,7 +8,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${reflexMvtStockInterface.hd_number}"
+         "RefID": "${reflexMvtStockInterface.hd_number?trim?json_string}"
    },     
    "Payload": {
    "ReceivedContents" :[
@@ -18,16 +18,20 @@
            "AuthorTimeZone": "${time_zone_rfx}"            
             },
       "Goods": {
-           "ItemID": "${reflexMvtStockInterface.item_code}",
-           "LVBranchID": "${reflexMvtStockInterface.lv_code}",
+           "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
+           "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}",
           "PriorityDate": "${priority_date}",
         
         <#-- Goods received Segmentation Keys inclusion  -->
         <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl">
         },
-       "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference}",
+        <#if reflexMvtStockInterface.receipt_reference!="">
+          "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+        <#else>
+          "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
+        </#if>
       "LineID": "${reflexMvtStockInterface.receipt_line_number}",
-       "ActorID": "${reflexMvtStockInterface.physical_depot_code}",
+        "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
       "Quantity": {
            "LVID": "${quantity_in_base_lv_RP_Cst}",
            "Value": ${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs}           
--- a/RFXtoRP_HsaIpgMove_StockMoved.ftl
+++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl
@@ -23,26 +23,26 @@
    },
    "Payload": {
      "Goods": {
-        "ItemID": "${reflexMvtStockInterface.item_code}",        
+        "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
        "PriorityDate": "${ipg_priority_datetime}",
        
        <#-- Segmentation keys inclusions -->
        <#include "RFXtoRP_HsaIpgMove_StockMoved_SegmentationKeys.ftl">,
        
        
-        "LVBranchID": "${reflexMvtStockInterface.lv_code}"
+        "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}"
      },
-      "ActorID": "${reflexMvtStockInterface.physical_depot_code}",
+      "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
      "Movement": {
            
       "DateTime": {
        "DateTime": "${generation_date}",
        "AuthorTimeZone": "${time_zone_rfx}"
        },
-        "Author": "ReflexWMS-${reflexMvtStockInterface.ipg_move_creation_user_code}",
+        "Author": "ReflexWMS-${reflexMvtStockInterface.ipg_move_creation_user_code?json_string}",
        "ExternalMoveRef" : "${reflexMvtStockInterface.ipg_move_year_number} - ${reflexMvtStockInterface.ipg_move_number}",
        "Type": "${MoveType_KV[reflexMvtStockInterface.ipg_move_type]!reflexMvtStockInterface.ipg_move_type}",
-        "Reason": "${reflexMvtStockInterface.miscellaneous_receipts_despatches_code}",  
+        "Reason": "${reflexMvtStockInterface.miscellaneous_receipts_despatches_code?json_string}",
        "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}",
--- a/RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl
+++ b/RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl
@@ -5,7 +5,7 @@
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-      "RefID": "${lv.item_code}"
+      "RefID": "${lv.item_code?trim?json_string}"
    },
    "Payload": {
    "RemovedLogisticVariantIDs":["${lv.logistical_variant_code}"] 
--- a/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl
+++ b/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl
@@ -5,19 +5,19 @@
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-      "RefID": "${lv.item_code}"
+      "RefID": "${lv.item_code?trim?json_string}"
    },
    "Payload": {
        "LogisticVariants": [
           { 
-          "LVID": "${lv.logistical_variant_code}",           
-          "Name" : "${lv.lv_type_code}",          
+          "LVID": "${lv.logistical_variant_code?json_string}",
+          "Name" : "${lv.lv_type_code?json_string}",
          <#if lv.id_list??>  
          "Codes": [
                   <#list lv.id_list as id>
                   {
-                      "Key":   "${id.logistical_variant_ID_type_code}",
-                      "Value": "${id.logistical_variant_ID_code}"
+                      "Key":   "${id.logistical_variant_ID_type_code?json_string!""}",
+                      "Value": "${id.logistical_variant_ID_code?json_string!""}"
                   }<#sep>,</#sep>
                     </#list> 
                   ],  
@@ -29,7 +29,7 @@
          "IsBaseLogisticVariant": ${lv.base_lv},
        
        <#if lv.base_lv != "true">
-            "RefLV": "${lv.subpackaging_lv_code}",
+            "RefLV": "${lv.subpackaging_lv_code?json_string}",
            </#if>
        
          "QuantityInRefLV": ${lv.quantity_in_subpackaging_lv},
--- a/RFXtoRP_HsaItm_ItemCreated.ftl
+++ b/RFXtoRP_HsaItm_ItemCreated.ftl
@@ -6,7 +6,7 @@
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-      "RefID": "${item.item_code}"    
+      "RefID": "${item.item_code?trim?json_string}"
    },
    "Payload": {
      "DescriptionsByLanguage": [{
@@ -32,15 +32,15 @@
           
           <#list item.logistical_variant_list as logistical_variant>      
               { 
-            "LVID": "${logistical_variant.logistical_variant_code}",
-            "Name" : "${logistical_variant.lv_type_code}", 
+            "LVID": "${logistical_variant.logistical_variant_code?json_string}",
+            "Name" : "${logistical_variant.lv_type_code?json_string}",
              
              <#if logistical_variant.id_list??>  
            "Codes": [
                       <#list logistical_variant.id_list as id>
                       {
-                          "Key":   "${id.logistical_variant_ID_type_code}",
-                          "Value": "${id.logistical_variant_ID_code}"
+                          "Key":   "${id.logistical_variant_ID_type_code?json_string!""}",
+                          "Value": "${id.logistical_variant_ID_code?json_string!""}"
                       }<#sep>,</#sep>
                         </#list> 
                       ],  
@@ -52,7 +52,7 @@
            "IsBaseLogisticVariant": ${logistical_variant.base_lv},
            
            <#if logistical_variant.base_lv != "true">
-              "RefLV": "${logistical_variant.subpackaging_lv_code}",
+              "RefLV": "${logistical_variant.subpackaging_lv_code?json_string}",
              </#if>
            
              "QuantityInRefLV": ${logistical_variant.quantity_in_subpackaging_lv},
--- a/RFXtoRP_HsaItm_ItemDeleted.ftl
+++ b/RFXtoRP_HsaItm_ItemDeleted.ftl
@@ -5,7 +5,7 @@
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-      "RefID": "${item.item_code}"
+      "RefID": "${item.item_code?trim?json_string}"
    },
    "Payload": {}      
  }
--- a/RFXtoRP_HsaProStatus.ftl
+++ b/RFXtoRP_HsaProStatus.ftl
@@ -61,8 +61,8 @@
                           <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl">          
                        }
                     <#else>
-                        <#stop "Reflex WMS status not supported on Reflex Platform">
-                     </#if>
+                        <#stop>
+					 </#if>
                  </#if>
               </#if>
            </#if>
--- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
@@ -8,7 +8,7 @@
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-      "RefID": "${preparationStatusInterface.preparation_order_originator_reference}",
+      "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
    "RefDate": {
      "DateTime": "${preparation_status_datetime}",
      "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
@@ -7,7 +7,7 @@
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference}",
+         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl
@@ -7,7 +7,7 @@
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference}",
+         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl
@@ -7,7 +7,7 @@
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference}",
+         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_TransportStarted.ftl
+++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl
@@ -7,7 +7,7 @@
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference}",
+         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaSup_ActorCreated.ftl
+++ b/RFXtoRP_HsaSup_ActorCreated.ftl
@@ -4,7 +4,7 @@
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-      "RefID": "${actor.code}"
+      "RefID": "${actor.code?trim?json_string}"
    },
     
    "Payload": {
--- a/RFXtoRP_HsaSup_ActorDeleted.ftl
+++ b/RFXtoRP_HsaSup_ActorDeleted.ftl
@@ -4,7 +4,7 @@
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-      "RefID": "${actor.code}"
+      "RefID": "${actor.code?trim?json_string}"
    },
     
    "Payload": {}
--- a/RFXtoRP_HsrDepot_ActorCreated.ftl
+++ b/RFXtoRP_HsrDepot_ActorCreated.ftl
@@ -4,7 +4,7 @@
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-      "RefID": "${depot.physical_depot_code}"
+      "RefID": "${depot.physical_depot_code?trim?json_string}"
    },
    
    "Payload": {
--- a/RFXtoRP_HsrDepot_ActorDeleted.ftl
+++ b/RFXtoRP_HsrDepot_ActorDeleted.ftl
@@ -4,7 +4,7 @@
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-      "RefID": "${depot.physical_depot_code}"
+      "RefID": "${depot.physical_depot_code?trim?json_string}"
    },
    
    "Payload": {}
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -19,7 +19,7 @@
 <#if	preparationOrder.total_lv_validated !=0>   
 	   [  
         {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.GoodsPrepared> 
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared> 
         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
         "datas" :         
          <#include "RFXtoRP_HsrPrepa_GoodsPrepared.ftl">          
--- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl
@@ -30,50 +30,50 @@
    "PreparedContents" :[
       {
       "Goods": {
-           "ItemID": "${preparation_line.item_code}",
-           "LVBranchID": "${preparation_line.item_lv_code}",
+           "ItemID": "${preparation_line.item_code?trim?json_string}",
+           "LVBranchID": "${preparation_line.item_lv_code?json_string}",
           <#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>
-                "PriorityDate": "error_date",
+			 <#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": "1970-01-01T00:00:00Z",
          </#if>           
          </#if>           
          </#if>             
          </#if>           
-          </#if>          
+          </#if> 
+          </#if> 		  
       
       <#-- Segmentation Keys inclusion -->
       <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
         },
-       "ExecutionflowID": "${preparation_line.preparation_order_originator_reference}",
+       "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
        <#if (preparation_line.pro_originator_reference_line_number!0) != 0> 
          "LineID": "${preparation_line.pro_originator_reference_line_number}",
        <#else>
          "LineID": "${preparation_line.pro_line_number!0}",
        </#if>
-       "ActorID": "${preparationOrder.physical_depot_code}",
+       "ActorID": "${preparationOrder.physical_depot_code?trim?json_string}",
       "Quantity": {
            "LVID": "${quantity_in_base_lv_RP_Cst}",
            "Value": ${despatched_ipg.quantity_lvs}           
--- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
+++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
@@ -7,7 +7,7 @@
    "ProjectID": "${projectRP}"     
    },
    "ID": {
-      "RefID": "${despatched_ipg.consignment_unit_id}"
+			"RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}"
      },
    "Payload": {
      <#if despatched_ipg.carton_number != "000000000000000000"> 
--- a/RFXtoRP_HsrPro.ftl
+++ b/RFXtoRP_HsrPro.ftl
@@ -17,9 +17,9 @@
      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> 
       [  
         {
+        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
         <#-- check preparation type code (internal order and reservation are ignored)  -->
-         <#if preparation_order.preparation_type_code == "010" || order.preparation_type_code == "030">
-         
+          <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030">
          <#-- Only if preparation order not confirmed  -->
          <#if preparation_order.preparation_order_confirmed == "false" >
            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> 
@@ -33,6 +33,9 @@
        <#else>
          <#stop "preparation order type not supported">  
        </#if>         
+        <#else>
+          <#stop "PRO reference is empty">
+        </#if>
         }
         
       ]  
--- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
@@ -1,13 +1,13 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(order.modification_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTC(preparation_order.modification_datetime,time_zone_offset_rfx) />
 [
  {  
    "Header": {
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-      "RefID": "${preparation_order.originator_reference}",
+      "RefID": "${preparation_order.originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -8,7 +8,7 @@
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-      "RefID": "${preparation_order.originator_reference}",
+      "RefID": "${preparation_order.originator_reference?trim?json_string}",
    "RefDate": {
            "DateTime": "${pro_creation_datetime}",
           "AuthorTimeZone": "${time_zone_rfx}"            
@@ -21,13 +21,33 @@
             },   
            <#-- Header Metadata inclusion -->
       <#include "RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl">,
-        
+       <#-- Add transport grade code 
+        <#if preparation_order.transport_grade_code!="">
+                "CarrierService":"${preparation_order.transport_grade_code?trim?json_string}",
+        </#if> -->
        "ShipFrom": { 
-        "ActorID": "${preparation_order.physical_depot_code}"
+        "ActorID": "${preparation_order.physical_depot_code?trim?json_string}"
        },
       "ShipFromAcked": true,    
         "ShipTo": {
-          <#if preparation_order.address.type_code == "" && preparation_order.address.title_code == "" && preparation_order.address.first_name == "" && preparation_order.address.last_name == "" && preparation_order.address.mail_address == "" && preparation_order.address.contact_type_code == "" && preparation_order.address.mobile_phone_number == "" && preparation_order.address.land_line_phone_number == "" && preparation_order.address.fax_number == "" && preparation_order.address.address_type_code == "" && preparation_order.address.name_or_company_name == "" && preparation_order.address.additional_address_data_1 == "" && preparation_order.address.additional_address_data_2 == "" && preparation_order.address.post_code_area_name == "" && preparation_order.address.territorial_division_code == "" && preparation_order.address.postal_code == "" && preparation_order.address.iso_country_code == ""> 
+          <#if 
+          <#-- preparation_order.address.type_code == "" && 
+          preparation_order.address.title_code == "" && 
+          preparation_order.address.first_name == "" && 
+          preparation_order.address.last_name == "" && 
+          preparation_order.address.mail_address == "" && 
+          preparation_order.address.contact_type_code == "" && 
+          preparation_order.address.mobile_phone_number == "" && 
+          preparation_order.address.land_line_phone_number == "" && 
+          preparation_order.address.fax_number == "" && -->
+          preparation_order.address.address_type_code == "" && 
+          preparation_order.address.name_or_company_name == "" && 
+          preparation_order.address.additional_address_data_1 == "" && 
+          preparation_order.address.additional_address_data_2 == "" && 
+          preparation_order.address.post_code_area_name == "" && 
+          preparation_order.address.territorial_division_code == "" && 
+          preparation_order.address.postal_code == "" && 
+          preparation_order.address.iso_country_code == ""> 
            "ActorID": "${preparation_order.end_consignee_code}"
          <#else>        
            "Actor": 
@@ -43,14 +63,13 @@
                 "StreetAddressThree" : "${preparation_order.address.additional_address_data_2?json_string!""}"
                 }
                  },
-              "Contact" :
+              "Contact" : 
                {
                  "FirstName" : "${preparation_order.address.first_name?json_string!""}",
                  "LastName" : "${preparation_order.address.last_name?json_string!""}",  
-                  "Emails" : ["${preparation_order.address.mail_address?json_string!""}"],   
-                  "Phones" : ["${preparation_order.address.mobile_phone_number!""}","${preparation_order.address.land_line_phone_number!""}", "${preparation_order.address.fax_number!""}" ]
-                }                    
-                 
+                  "Emails" : ${splitEmailsIntoArray(preparation_order.address.mail_address!""?json_string)},   
+                  "Phones" : ["${preparation_order.address.mobile_phone_number?json_string!""}","${preparation_order.address.land_line_phone_number?json_string!""}", "${preparation_order.address.fax_number?json_string!""}" ]
+                }                          
          </#if>         
         },
         
@@ -70,8 +89,8 @@
             {             
                   "Goods": 
               {
-                  "ItemID":   "${preparation_order_line.item_code!"0"}",
-                  "LVBranchID":   "${preparation_order_line.item_lv_code!"0"}",
+                  "ItemID":   "${preparation_order_line.item_code?trim?json_string!"0"}",
+                  "LVBranchID":   "${preparation_order_line.item_lv_code?json_string!"0"}",
                  <#if (preparation_order_line.optional_attributes.forced_priority_date?length  != 0) && (preparation_order_line.optional_attributes.forced_priority_date?starts_with("00") == false)>
                       <#assign forced_priority_date = preparation_order_line.optional_attributes.forced_priority_date?datetime(rfx_date_format_default)?iso_utc />                       
                           "PriorityDate": "${forced_priority_date}", 
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -15,7 +15,7 @@
           
      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)> 
-
+      <#if receipt.receipt_reference ?? && receipt.receipt_reference!="">
      <#if receipt.receipt_type = "030">
      <#stop "ignored message because receipt type = transfert">
      <#else>
@@ -36,6 +36,9 @@
        }
       ] 
       </#if> 
+        <#else>
+          <#stop "Receipt reference is empty">
+        </#if>
      <#break>
    <#case "U">
       <#-- *********************************************** Action = UPDATE ******************** -->
--- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@@ -8,7 +8,7 @@
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-      "RefID": "${receipt.receipt_reference}",
+      "RefID": "${receipt.receipt_reference?trim?json_string}",
      "RefDate": {
        "DateTime": "${receipt_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -8,7 +8,7 @@
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-      "RefID": "${receipt.receipt_reference}",
+      "RefID": "${receipt.receipt_reference?trim?json_string}",
      "RefDate": {
            "DateTime": "${receipt_creation_datetime}",
            "AuthorTimeZone": "${time_zone_rfx}"            
@@ -25,16 +25,16 @@
      
      "ShipFrom": 
      {
-      "ActorID": "${receipt.original_code}"
+      "ActorID": "${receipt.original_code?trim?json_string}"
      },
        "ShipTo"  : 
      {
-      "ActorID": "${receipt.physical_depot_code}"
+      "ActorID": "${receipt.physical_depot_code?trim?json_string}"
      },
      "ShipToAcked": true,  
        
      <#if receipt.carrier_informations.carrier_code != "">
-          "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code}"}, 
+          "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code?trim?json_string}"},
      </#if>         
       
      
@@ -49,15 +49,15 @@
          {             
            "Goods": 
            {
-              "ItemID":   "${line.item_code!"0"}",
-              "LVBranchID":   "${line.item_lv_code!"0"}",                   
+              "ItemID":   "${line.item_code?trim?json_string!"0"}",
+              "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
              <#if line.line_without_detail??> 
                  <#if (line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
                   <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />  
                   "PriorityDate": "${line_without_detail_priority_date}", 
                  </#if>
              <#else>
-                <#stop "line with detail">
+                <#stop >
              </#if>
              <#-- Segmentation Keys inclusion -->
              <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl">
--- a/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl
@@ -7,7 +7,7 @@
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-      "RefID": "${receipt.receipt_reference}",
+      "RefID": "${receipt.receipt_reference?trim?json_string}",
      "RefDate": {
        "DateTime": "${receipt_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
@@ -8,7 +8,7 @@
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-         "RefID": "${receipt.receipt_reference}",
+         "RefID": "${receipt.receipt_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${receipt_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_RestResponse.ftl
+++ b/RFXtoRP_RestResponse.ftl
@@ -43,7 +43,11 @@
 	           <#default>
 				   [  
 					   {
-					     <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+					     <#if restResponsetMsg.body?? >
+						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+						 <#else>
+						 <#assign restResponseBody = "{}" />
+						 </#if>
 						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> 
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						 "datas" :         
@@ -57,7 +61,7 @@
 			 <#switch restResponsetMsg.status>
 	             <#case 200>
 	             <#case 201>
-					<#-- *********************************************** ApiRestID = preparation_orders_post ******************** -->
+					<#-- *********************************************** ApiRestID = receipts_post ******************** -->
 					<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
 					<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)> 
 					<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" > 
@@ -85,7 +89,11 @@
 	           <#default>
 				   [  
 					   {
-					     <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+						<#if restResponsetMsg.body?? >
+						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+						 <#else>
+						 <#assign restResponseBody = "{}" />
+						 </#if>
 						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> 
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						 "datas" :         
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -28,6 +28,7 @@
 		"intermediate_consignee": "false",
 		"protected": "${protected_flag}",
        "automatic_generation": "${automatic_generation_flag}",
+		"deactivate": "false",
 		"optional_attributes": {
 			"apt_with_end_consignee": "${apt_with_end_consignee_flag}",
 			"apt_with_intermediate": "false",
@@ -35,13 +36,13 @@
 		  	},
 		<#if executionflow.ShipTo.ActorID == ""> 
 		"address": {
-				"first_name": "${executionflow.ShipTo.Contact.FirstName?json_string!""}",
-				"last_name" :"${executionflow.ShipTo.Contact.Lastname?json_string!""}",
+				"first_name": "${executionflow.ShipTo.Contact.FirstName!""?json_string}",
+				"last_name" :"${executionflow.ShipTo.Contact.Lastname!""?json_string}",
 				"mail_address": "${executionflow.ShipTo.Actor.Emails[0]!""}",
 				"mobile_phone_number": "${executionflow.ShipTo.Actor.Phones[0]!""}",
-				"street_and_number_and_po_box": "${executionflow.ShipTo.Actor.Address.StreetAddressOne?json_string!""}",
-				"additional_address_data_1": "${executionflow.ShipTo.Actor.Address.StreetAddressTwo?json_string!""}",
-				"additional_address_data_2": "${executionflow.ShipTo.Actor.Address.StreetAddressThree?json_string!""}",
+				"street_and_number_and_po_box": "${executionflow.ShipTo.Actor.Address.StreetAddressOne!""?json_string}",
+				"additional_address_data_1": "${executionflow.ShipTo.Actor.Address.StreetAddressTwo!""?json_string}",
+				"additional_address_data_2": "${executionflow.ShipTo.Actor.Address.StreetAddressThree!""?json_string}",
 				"postal_code": "${executionflow.ShipTo.Actor.Address.PostalCode!""}",
 				"iso_country_code": "${executionflow.ShipTo.Actor.Address.CountryCode!""}"
 			  },
@@ -66,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,14 +2,22 @@

 <#-- 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 = "PEN"/>
-<#assign originator_code = "50000189"/>
-<#assign preparation_type_code = "010"/>
-<#assign requested_delivery_date_type = "010"/>
+
+<#assign activity_code = ""/>
+<#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"/>
--- 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.ftl
+++ b/RPtoRFX_Receipt.ftl
@@ -19,30 +19,26 @@
 		"carrier_code"   : "${executionflow.Carrier.ActorID!""}",

 		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> 
-		"receipt_datetime":  "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}",
+			"receipt_datetime":  "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}",
 		<#else>
-		"receipt_datetime":  "${aDateTime?iso_utc}",
+			"receipt_datetime":  "${aDateTime?iso_utc}",
 		</#if>
-
-		  <#--
-		  "carrier_appointment_made": "false",
-		  "receipt_in_cross_docking": "false",
-		  "dock_occupation_duration": 10,
-		  -->
+		"carrier_appointment_made": "false",
+		"receipt_in_cross_docking": "false",
+		"dock_occupation_duration": 1,
 		  
 		<#if executionflow.Lines??> 
-		"line_list": [
-		<#list executionflow.Lines as line>
+			"line_list": [
+			<#list executionflow.Lines as line>

 			<#-- ******* line  MetaData and Segmentationkeys to maps ******** -->
-			<#if line.MetaData??>
-			<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
-			</#if>
-			<#if line.RequestedContent.Goods.SegmentationKeys??>
-			<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
-			</#if>
+				<#if line.MetaData??>
+				<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
+				</#if>
+				<#if line.RequestedContent.Goods.SegmentationKeys??>
+				<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
+				</#if>
 			<#include "RPtoRFX_Receipt_DefaultLineData.ftl">
-
 			{
 				"receipt_reference_line_no": ${line.LineID?number},
 				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
@@ -50,20 +46,17 @@
 				"level_1_quantity": ${line.RequestedMetrics.QuantityInBaseLV.Value!0},
 				"owner_code": "${owner_code}",
 				"grade_code": "${grade_code}",
-				"batch_1": "${batch_1!""}",	
-
-				<#--
+				"batch_1": "${batch_1!""}",					
 				"optional_attributes": {
-			   		"held_for_check": "false",
+			   		<#--"held_for_check": "false",
 			   		"held _for_repacking": "false",
-			   		"hold_for_specific_code": "false",
-			   		"hold_code": "false"
-		 		},
-				-->
-		  		"quality_control_attributes": {
-	        		<#--"qcf_to_create_for_receipt_line": "false",-->
+			   		"hold_code": "false", -->
+					"hold_for_specific_code": "false"
+		 		}
+		  		<#--"quality_control_attributes": {
+	        		"qcf_to_create_for_receipt_line": "false",
 	         		"exclude_item_from_inspection": "false"
-  				} 
+  				} -->

 			}<#sep>,</#sep>
 		</#list> 	     	
--- a/RPtoRFX_Receipt_DefaultHeaderData.ftl
+++ b/RPtoRFX_Receipt_DefaultHeaderData.ftl
@@ -2,11 +2,18 @@

 <#-- 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 = "PEN"/>
-<#assign originator_code = "STANDARD"/>
-<#assign receipt_type = "010"/>
-<#assign receipt_reason_code = "REC"/>
-<#assign work_mode_code = "LPA"/>
+<#assign activity_code = ""/>
+<#assign originator_code = ""/>
+<#assign receipt_type = ""/>
+<#assign receipt_reason_code = ""/>
+<#assign work_mode_code = ""/>
--- a/RPtoRFX_Receipt_DefaultLineData.ftl
+++ b/RPtoRFX_Receipt_DefaultLineData.ftl
@@ -3,10 +3,17 @@

 <#-- 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
 -->


-<#assign owner_code = "PEN"/>
-<#assign grade_code = "STD"/>
-<#assign batch_1 = "STD"/>
+<#assign owner_code = ""/>
+<#assign grade_code = ""/>
+<#assign batch_1 = ""/>
--- a/ReflexUtils.ftl
+++ b/ReflexUtils.ftl
@@ -6,4 +6,23 @@
  <#return (datetimeUTC)>
 </#function>

-    
+<#-- --------------------------------------------------------------------------------------- -->
+<#-- Split email reflex into json array string                                               -->
+<#--  Example : splitemail "john.doe@hardis-group.com,;         name@hardis-group.com"       -->
+<#--  return "["john.doe@hardis-group.com","name@hardis-group.com"]"                         -->
+<#-- --------------------------------------------------------------------------------------- -->
+<#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)>
+</#function>
--- a/2
+++ b/2
@@ -1 +1 @@
-1.2.8+1
+1.2.12+3
Author	SHA1	Message	Date
freat	3365a94098	Release 1.2.12+3	2024-02-29 15:35:54 +01:00
Francis Reat	e055eab522	Merge branch 'SCPN1-6093' into 'release/1.2' SCPN1-6093 See merge request r-d-technique/tiers/reflex-wms-connector!18	2024-02-29 14:35:25 +00:00
frea	c95bdc7f00	SCPN1-6093	2024-02-29 15:32:01 +01:00
freat	319cb6cc51	Release 1.2.12+2	2024-02-29 14:51:31 +01:00
Francis Reat	1f289e229c	Merge branch 'SCPN1-6093' into 'release/1.2' SCPN1-6093 See merge request r-d-technique/tiers/reflex-wms-connector!17	2024-02-29 13:30:33 +00:00
frea	fba36b5d77	SCPN1-6093	2024-02-29 14:16:53 +01:00
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
freat	fc8290648f	Release 1.2.9+1	2024-01-10 10:40:42 +01:00
Francis Reat	378c1ba75f	Merge branch 'SCPN1-5651' into 'release/1.2' Resolve SCPN1-5651 See merge request r-d-technique/tiers/reflex-wms-connector!7	2024-01-10 09:33:49 +00:00
frea	d94a74d399	Partial Merge branch 'develop' into SCPN1-5651	2024-01-09 17:17:26 +01:00
Laurie Montant	61753efabe	Modifs JsonString 0901241701	2024-01-09 17:01:45 +01:00
Laurie Montant	c6a91f1980	Modifs RestResponse 0901241639	2024-01-09 16:39:30 +01:00
Laurie Montant	39ab7c4ce7	Modifs RPtoRFX 0901241622	2024-01-09 16:22:10 +01:00
Laurie Montant	e808925e0a	Modifs RPtoRFX 0901241007	2024-01-09 10:08:49 +01:00
Laurie Montant	c103fc7f5a	Modifs RPtoRFX 0901240955	2024-01-09 09:56:00 +01:00
Laurie Montant	1a9454cd2f	Modifs Email 0801241009	2024-01-08 10:09:17 +01:00
Laurie Montant	aaf8fc5bb6	Modifs 0501241702	2024-01-05 17:02:33 +01:00
Laurie Montant	7acf529870	Modifs RPtoRFX_Order	2024-01-05 14:04:58 +01:00
Laurie Montant	47326a6b0c	Modifs 0401241551	2024-01-04 15:51:04 +01:00
Laurie Montant	cb0385a64f	Modifs 0401241457	2024-01-04 14:57:31 +01:00
freat	a882ac4b86	Release 1.2.8+2	2024-01-03 14:42:40 +01:00
frea	d2d9443fc7	bug SCPN1-5632	2024-01-03 13:32:45 +01:00
Laurie Montant	a5fa0dbfd9	Modifs HsrPro_ExecutionflowCancelled 0301231159	2024-01-03 11:59:20 +01:00
Laurie Montant	ca2dfe3fb2	Modifs 0301231029	2024-01-03 10:29:22 +01:00
Laurie Montant	980a44c1be	Modifs 0301231014	2024-01-03 10:14:45 +01:00
Laurie Montant	6faa6bb4fc	Modifs 0301240942	2024-01-03 09:42:44 +01:00
Laurie Montant	8b4103e50d	Modifs 0201241109	2024-01-02 11:09:20 +01:00
Laurie Montant	bff543d852	Modifs 0201241057	2024-01-02 10:57:46 +01:00
Laurie Montant	0b71455e6f	Modifs 0201241034	2024-01-02 10:34:43 +01:00
Laurie Montant	18f1bb3749	Modifs 2812231059	2023-12-28 10:59:43 +01:00
Laurie Montant	8211fcebf0	Modifs 2812231056	2023-12-28 10:56:19 +01:00
Laurie Montant	fcfb9206c0	Modifs 2812231048	2023-12-28 10:48:31 +01:00
Laurie Montant	59afa9fd65	Modifs 2812230930	2023-12-28 09:30:10 +01:00
Laurie Montant	07188a5c20	Modifs 2712231659	2023-12-27 16:59:30 +01:00
Laurie Montant	137982fcc0	Modifs 2712231641	2023-12-27 16:41:21 +01:00
Laurie Montant	64c35417b3	Modifs 2712231622	2023-12-27 16:22:25 +01:00
Laurie Montant	b6bf4d2be8	Modifs 2712231544	2023-12-27 15:44:15 +01:00
Laurie Montant	86a4180718	Modifs 2712231520	2023-12-27 15:20:53 +01:00
Laurie Montant	108e30d129	Modifs 2712231507	2023-12-27 15:07:45 +01:00
Laurie Montant	dd1d4980a8	Modifs 2112231116	2023-12-21 11:16:23 +01:00
Laurie Montant	8f212cf7c9	modifs 2012231201	2023-12-20 12:01:56 +01:00
Laurie Montant	c2e0cb7a15	Modifs 2012231153	2023-12-20 11:53:09 +01:00
Laurie Montant	7505c15a4a	Modifs 2012231148	2023-12-20 11:48:59 +01:00
Laurie Montant	705ad9be63	Modifs 2012231139	2023-12-20 11:40:05 +01:00
Laurie Montant	7e2c22b4c9	Modifs 2012231135	2023-12-20 11:36:00 +01:00
Laurie Montant	27f2e18f0f	Modifs 2012231122	2023-12-20 11:22:03 +01:00
Laurie Montant	783d7efd04	Modifs 2012231047	2023-12-20 10:47:18 +01:00
Laurie Montant	e319d273bb	Modifs 2012231044	2023-12-20 10:44:03 +01:00
Laurie Montant	cb1793bf22	Modifs 1912231717	2023-12-19 17:17:54 +01:00
Laurie Montant	eac8ddc598	Modifs 1812231038	2023-12-18 10:38:42 +01:00
Laurie Montant	ba43f65277	Modifs 1512231750	2023-12-15 17:50:45 +01:00
Laurie Montant	b3cfa5c66d	modifs 1512231745	2023-12-15 17:45:03 +01:00
Laurie Montant	882709f01b	Modifs 1512231734	2023-12-15 17:35:01 +01:00
Laurie Montant	38ef2bd3df	modifs 1512231727	2023-12-15 17:27:23 +01:00
Laurie Montant	cd75521f81	Modifs 1512231721	2023-12-15 17:21:12 +01:00
Laurie Montant	943a02d5f3	Modifs 1512231720	2023-12-15 17:20:40 +01:00
Laurie Montant	68e6840512	Modifs 1512231712	2023-12-15 17:12:36 +01:00
Laurie Montant	26facb3d6a	Modifs 1512231705	2023-12-15 17:05:22 +01:00
Laurie Montant	7a3223a1ac	Modifs 1512231613	2023-12-15 16:15:49 +01:00
Laurie Montant	7d32478c1b	modifs 1512231548	2023-12-15 15:48:26 +01:00
Laurie Montant	88307561d2	Modifs 1512231545	2023-12-15 15:45:27 +01:00
Laurie Montant	2bdc02a1d4	Motifs 1512231531	2023-12-15 15:31:40 +01:00
Laurie Montant	e709d7d78a	Modifs 1512231424	2023-12-15 14:24:36 +01:00
Laurie Montant	03f53c0fd0	Modifs 1512231407	2023-12-15 14:07:51 +01:00
Laurie Montant	ac731180db	Modifs 1512231109	2023-12-15 11:10:02 +01:00
Laurie Montant	97d08b554c	Modifs 1312231434	2023-12-13 14:34:51 +01:00
Laurie Montant	4636ca6c42	modifs 1312231423	2023-12-13 14:24:04 +01:00
Laurie Montant	8f066d7f62	Modifs 1312231411	2023-12-13 14:11:22 +01:00
Laurie Montant	dfdfd8c60e	Modifs 1312231218	2023-12-13 12:18:31 +01:00
Laurie Montant	41447dbc35	Modifs 1212231643	2023-12-12 16:43:56 +01:00
Laurie Montant	ae338b00d1	Modifs 12121549	2023-12-12 15:49:58 +01:00
Laurie Montant	14243be12f	Modifs 1212231545	2023-12-12 15:45:36 +01:00
Laurie Montant	c5c5f2bef7	Modifs 1212231532	2023-12-12 15:32:53 +01:00
Laurie Montant	edc5142c3f	Modifs 1212231511	2023-12-12 15:11:12 +01:00
Laurie Montant	c79ab16480	Modifs 1212231425	2023-12-12 14:25:58 +01:00
Laurie Montant	97474cf5e4	Modifs 1212231201	2023-12-12 12:01:40 +01:00
Laurie Montant	0115159507	Modifs 1212231156	2023-12-12 11:56:33 +01:00
Laurie Montant	5222b56cc3	Modifs 1212231150	2023-12-12 11:50:23 +01:00
Laurie Montant	c27aec2730	modifs 1212231111	2023-12-12 11:11:59 +01:00
Laurie Montant	b286711d56	Modifs 1212231104	2023-12-12 11:04:13 +01:00
Laurie Montant	ba7ce14568	modifs 1212231058	2023-12-12 10:58:30 +01:00
Laurie Montant	02eb8cbe4e	Modifs 1212231052	2023-12-12 10:52:22 +01:00
Laurie Montant	dbde25f5d3	Modifs 1212231047	2023-12-12 10:47:56 +01:00
Laurie Montant	fbba0ede34	Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop	2023-12-12 09:46:36 +01:00
Laurie Montant	adaedeec31	Modifs HsrPrepa 121223	2023-12-12 09:46:28 +01:00
frea	fe66e643c0	SCPN1-5358 mise à vide des valeurs	2023-12-12 08:44:05 +01:00
Laurie Montant	43553eb1e4	Modifs HSRprepa 111223	2023-12-11 13:56:25 +01:00
Laurie Montant	1ed9617af7	Modifs hsrprepa 111223	2023-12-11 13:31:26 +01:00
Laurie Montant	1de8a56410	modifs lmo	2023-12-08 12:23:16 +01:00
Laurie Montant	9bb625bade	Modif HsrPrepa 0112231019	2023-12-01 10:20:01 +01:00
Laurie Montant	e093ea7c07	Modifs FTL 2211231645	2023-11-22 16:45:11 +01:00
Laurie Montant	3d9ec5b813	Modif FTL 2211231459	2023-11-22 14:59:25 +01:00
Laurie Montant	6b4f7e2ccc	Modifs FTL 2211231443	2023-11-22 14:43:53 +01:00
Laurie Montant	0485a637af	Modif 2011231720 HsrPro	2023-11-20 17:20:54 +01:00
Laurie Montant	293a4fb65c	Modif alignement champs techniques Reflex HsrPro 2011231657	2023-11-20 16:57:25 +01:00
@@ -1 +1 @@
 .2.8+1
 .2.12+3