Release 1.2.34+1

SCPN1-8483

See merge request r-d-technique/tiers/reflex-wms-connector!93

RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl

@@ -11,7 +11,7 @@
       "RefID": "${RFXtoRPprefixDepot(stock.physical_depot_code)}"
       },
     "Payload": {
-       <#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) />
+       <#assign generation_date = RfxDateTimetoUTCWithTimezone(stock.generation_date,time_zone_rfx) />
       "Snapshot": {
         "EndDateTime": {
            "DateTime": "${generation_date}",

RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl

@@ -9,7 +9,7 @@
     },
     "Payload": {
       "ActorID": "${RFXtoRPprefixDepot(stock.physical_depot_code)}",
-      <#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) />
+      <#assign generation_date = RfxDateTimetoUTCWithTimezone(stock.generation_date,time_zone_rfx) />
       "Snapshot": {
         "DateTime": {
            "DateTime": "${generation_date}",

RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl

@@ -17,21 +17,21 @@
                   "Value": { "String" : "no batch"}
                 <#else>
                    "Value": { "String" : "${stock.batch_1}"}
-            </#if>  
+            </#if>
             },
             {
             "Key": "HeldForSpecificCode",
             "Value": { "Bool" : "${stock.held_for_specific_code}"}
             },
-           
+
             {
-            <#assign manufacturing_datetime = RfxDateTimetoUTC(stock.Date_of_manufacture,time_zone_offset_rfx) />  
+            <#assign manufacturing_datetime = RfxDateTimetoUTCWithTimezone(stock.Date_of_manufacture,time_zone_rfx) />
             "Key": "ManufacturingDate",
             "Value": "Timestamp": {
 							"AuthorTimeZone": "${time_zone_rfx}",
 							"DateTime": "${manufacturing_datetime}"
 						  }
-            } 
+            }
           ]
 -->
 

RFXtoRP_HsaDispute_Created.ftl

@@ -65,6 +65,3 @@
         }
     }
 ]
-
-
-

RFXtoRP_HsaIpgMove.ftl

@@ -31,7 +31,8 @@
             reflexMvtStockInterface.ipg_move_type == "420" ||
             reflexMvtStockInterface.ipg_move_type == "455" ||
             reflexMvtStockInterface.ipg_move_type == "460" ||
-            reflexMvtStockInterface.ipg_move_type == "465"
+            reflexMvtStockInterface.ipg_move_type == "465" ||
+            (reflexMvtStockInterface.ipg_move_type == "520" && reflexMvtStockInterface.ipg_move_creation_program == "HFST69")
             >
             [
             {

RFXtoRP_HsaIpgMove_GoodsReceived.ftl

@@ -2,7 +2,7 @@
 <#include "ReflexUtils.ftl">
 <#include "ActorPrefix.ftl">
 [
-    <#assign receipt_confirmation_datetime = RfxDateTimetoUTC(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_offset_rfx) />
+    <#assign receipt_confirmation_datetime = RfxDateTimetoUTCWithTimezone(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_rfx) />
 	<#assign priority_date = reflexMvtStockInterface.ipg_priority_date?datetime(rfx_date_format_default)?iso_utc />
     {
     "Header": {

RFXtoRP_HsaIpgMove_StockMoved.ftl

@@ -18,9 +18,10 @@
             "420":"STOCK_MOVEMENT_TYPE_REQUALIFICATION",
             "455":"STOCK_MOVEMENT_TYPE_FIX",
             "460":"STOCK_MOVEMENT_TYPE_FIX",
-            "465":"STOCK_MOVEMENT_TYPE_FIX"
+            "465":"STOCK_MOVEMENT_TYPE_FIX",
+            "520":"STOCK_MOVEMENT_TYPE_OUTBOUND"
             }>
-<#assign generation_date = RfxDateTimetoUTC(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_offset_rfx) />
+<#assign generation_date = RfxDateTimetoUTCWithTimezone(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_rfx) />
 <#assign ipg_priority_datetime = reflexMvtStockInterface.ipg_priority_date?datetime(rfx_date_format_default)?iso_utc />
 [
   {
@@ -52,7 +53,11 @@
         "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?json_string}",
+        <#if reflexMvtStockInterface.ipg_move_type == "520" >
+          "Reason": " Transfert ${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)} to ${RFXtoRPprefixDepot(reflexMvtStockInterface.transfer_consignee_physical_depot_code?trim?json_string)}",
+        <#else>
+          "Reason": "${reflexMvtStockInterface.miscellaneous_receipts_despatches_code?json_string}",
+        </#if>
         "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}",

RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl

@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />
 
 [
   {

RFXtoRP_HsaProStatus_PreparationCompleted.ftl

@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />
 [
   {
     "Header": {

RFXtoRP_HsaProStatus_PreparationExpected.ftl

@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />
 [
   {
     "Header": {

RFXtoRP_HsaProStatus_PreparationStarted.ftl

@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />
 [
   {
     "Header": {

RFXtoRP_HsaProStatus_TransportStarted.ftl

@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />
 [
   {
     "Header": {

RFXtoRP_HsrPrepa.ftl

@@ -53,7 +53,7 @@
             <#assign hd_numberHmapHUadded ={}>
             <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
             <#list preparation_line.despatched_ipg_list as despatched_ipg>
-            <#assign HUadded_packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
+            <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
             <#if !hd_numberHmap[despatched_ipg.hd_number]?? >
                <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
                ,

RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl

@@ -1,7 +1,7 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-<#assign dispatched3_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
+<#assign dispatched3_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
 
   <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line3>
     <#list preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3>

RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl

@@ -2,7 +2,7 @@
 <#include "ReflexUtils.ftl">
 <#include "ActorPrefix.ftl">
 [
-<#assign dispatched_datetime5 = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
+<#assign dispatched_datetime5 = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
   {
     "Header": {
     "ProjectID": "${projectRP}"

RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl

@@ -1,7 +1,7 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-<#assign dispatched_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
+<#assign dispatched_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
 <#assign refIDHmap_local ={}>
   <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
     <#list preparation_line.despatched_ipg_list as despatched_ipg>

RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl

@@ -4,7 +4,7 @@
 [
   <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
     <#list preparation_line.despatched_ipg_list as despatched_ipg>
-    <#assign packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
+    <#assign packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
     {
     "Header": {
       "ProjectID": "${projectRP}"

RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl

@@ -2,7 +2,7 @@
 <#include "ReflexUtils.ftl">
 <#include "ActorPrefix.ftl">
 [
-<#assign dispatched_datetime4 = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
+<#assign dispatched_datetime4 = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
   {
     "Header": {
     "ProjectID": "${projectRP}"

RFXtoRP_HsrPro_ExecutionflowCancelled.ftl

@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparation_order.modification_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.modification_datetime,time_zone_rfx) />
 [
   {
     "Header": {

RFXtoRP_HsrPro_ExecutionflowDetected.ftl

@@ -3,8 +3,8 @@
 <#include "ActorPrefix.ftl">
 [
   {
-  <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTC(preparation_order.planned_final_delivery_start_datetime,time_zone_offset_rfx) />
+  <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.planned_final_delivery_start_datetime,time_zone_rfx) />
-  <#assign pro_creation_datetime = RfxDateTimetoUTC(preparation_order.creation_datetime,time_zone_offset_rfx) />
+  <#assign pro_creation_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.creation_datetime,time_zone_rfx) />
     "Header": {
       "ProjectID": "${projectRP}"
     },

RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl

@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.modification_datetime,time_zone_offset_rfx) />
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
 
 [
   {

RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl

@@ -3,8 +3,8 @@
 <#include "ActorPrefix.ftl">
 [
   {
-  <#assign receipt_datetime = RfxDateTimetoUTC(receipt.receipt_datetime,time_zone_offset_rfx) />
+  <#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) />
-  <#assign receipt_creation_datetime = RfxDateTimetoUTC(receipt.creation_datetime,time_zone_offset_rfx) />
+  <#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
      "Header": {
       "ProjectID": "${projectRP}"
     },

RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl

@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.confirmation_datetime,time_zone_offset_rfx) />
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) />
 [
   {
      "Header": {

RFXtoRP_HsrReceiptList_ReceiptExpected.ftl

@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.creation_datetime,time_zone_offset_rfx) />
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
 
 [
   {

RFXtoRP_RfxConfigurationRp.ftl

@@ -25,8 +25,8 @@
 
 
 
-<#noparse><#assign time_zone_rfx        = </#noparse>"${file.author_time_zone!"UTC"}<#noparse>"></#noparse>
+<#noparse><#assign time_zone_rfx        = </#noparse>"${file.author_time_zone!"Europe/Paris"}<#noparse>"></#noparse>
-<#noparse><#assign time_zone_offset_rfx = </#noparse>"${file.time_zone_offset!"+00:00"}<#noparse>"></#noparse>
+<#noparse><#assign time_zone_offset_rfx = </#noparse>"${file.time_zone_offset!"+01:00"}<#noparse>"></#noparse>
 
 
 <#list file.reflex_platform_project_list?filter(l -> l.name == projectRP) as reflex_platform_project>

VERSION

@@ -1 +1 @@
-1.2.30+1
+1.2.34+1