Compare commits

..

10 Commits

Author SHA1 Message Date
6f361e1ffe Release 2.0.5+1 2025-07-10 11:32:33 +02:00
43e0a5ad0d Merge branch 'SCPN1-8991-8980-9059-2.0' into 'release/2.0'
SCPN1-8991-8980-9059-2.0

See merge request r-d-technique/tiers/reflex-wms-connector!121
2025-07-10 09:31:47 +00:00
2a036decc0 SCPN1-9059 2025-07-10 09:54:08 +02:00
70b437619a SCPN1-9059 2025-07-09 18:17:05 +02:00
578afb23ef SCPN1-8980
(cherry picked from commit f5971a6b06)
2025-07-02 14:37:45 +02:00
fb329894cc SCPN1-8991
(cherry picked from commit 9d7293d92e)
2025-07-01 15:43:18 +02:00
706d1d057a Release 2.0.4+1 2025-06-20 17:57:11 +02:00
20404a16df Release 2.0.3+1 2025-05-27 09:57:49 +02:00
7d4a28d5bb Merge branch 'SCPN1-8800-2.0' into 'release/2.0'
SCPN1-8800 into release 2.0

See merge request r-d-technique/tiers/reflex-wms-connector!111
2025-05-27 07:10:46 +00:00
78642ec0d6 SCPN1-8800
(cherry picked from commit 9a7f669192)
2025-05-26 16:59:21 +02:00
7 changed files with 28 additions and 1 deletions

View File

@@ -0,0 +1,4 @@
<#-- use protobuf of class HsaDispute to find Reflex Wms fields names -->
"MetaData": [ ]

View File

@@ -39,6 +39,8 @@
</#if>
"Value": "${dispute.dispute_amount}"
},
<#-- Claim metadata inclusion -->
<#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl">,
<#-- To configure -->
<#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">
<#if dispute.dispute_type_code=="050" >

View File

@@ -26,7 +26,11 @@
"ShipFrom":
{
<#if receipt.receipt_type == '020'>
"ActorID": "${RFXtoRPprefixConsignee(receipt.original_code?trim?json_string)}"
<#else>
"ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
</#if>
},
"ShipTo" :
{

View File

@@ -44,6 +44,7 @@
"automatic_generation": "${automatic_generation_flag}",
"deactivate": "false",
"optional_attributes": {
<#include "RPtoRFX_PrepOrder_OptionalAttributes.ftl">
"apt_with_end_consignee": "${apt_with_end_consignee_flag}",
"apt_with_intermediate": "false",
"load_grouping": "${load_grouping}"
@@ -83,9 +84,13 @@
<#-- ******* line MetaData and Segmentationkeys to maps ******** -->
<#if line.MetaData??>
<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
<#else>
<#assign Line_MetaData_Map = {} />
</#if>
<#if line.RequestedContent.Goods.SegmentationKeys??>
<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
<#else>
<#assign SegmentationKeys_Map = {} />
</#if>
<#include "RPtoRFX_PrepOrder_DefaultLineData.ftl">
{

View File

@@ -0,0 +1,8 @@
<#-- Here are the fields that can be added
"end_consignee_apt_start_datetime": "0000-00-00T00:00:00",
"end_consignee_apt_end_datetime": "0000-00-00T00:00:00",
"reason_code": "str",
"planned_preparation_date": "0000-00-00",
"despatch_grouping": "string",
"reservation_end_datetime": "0000-00-00T00:00:00",
-->

View File

@@ -38,9 +38,13 @@
<#-- ******* line MetaData and Segmentationkeys to maps ******** -->
<#if line.MetaData??>
<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
<#else>
<#assign Line_MetaData_Map = {} />
</#if>
<#if line.RequestedContent.Goods.SegmentationKeys??>
<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
<#else>
<#assign SegmentationKeys_Map = {} />
</#if>
<#include "RPtoRFX_Receipt_DefaultLineData.ftl">
{

View File

@@ -1 +1 @@
2.0.2+2
2.0.5+1