Release 1.2.25+2

Merge branch 'SCPN1-7065' into 'release/1.2'
SCPN1-7065 See merge request r-d-technique/tiers/reflex-wms-connector!57
2024-08-29 10:59:28 +02:00 · 2024-08-29 08:48:06 +00:00 · 2024-08-29 10:37:54 +02:00 · 2024-08-08 16:55:33 +02:00 · 2024-08-07 12:23:46 +02:00
2 changed files with 31 additions and 30 deletions
--- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
@@ -74,12 +74,9 @@
       "Goods": {
           "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 = 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 = despatched_ipg.ipg_receipt_date?datetime(rfx_date_format_default)?iso_utc />
+           
+             <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
+				<#assign priority_date = despatched_ipg.ipg_use_by_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)>
@@ -90,8 +87,12 @@
 						<#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 = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc />
+						<#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)>
+							<#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 = despatched_ipg.ipg_receipt_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)>
--- a/2
+++ b/2
@@ -1 +1 @@
-1.2.23+2
+1.2.25+2
Author	SHA1	Message	Date
freat	8425747b42	Release 1.2.25+2	2024-08-29 10:59:28 +02:00
Francis Reat	03e20e7aed	Merge branch 'SCPN1-7065' into 'release/1.2' SCPN1-7065 See merge request r-d-technique/tiers/reflex-wms-connector!57	2024-08-29 08:48:06 +00:00
frea	04b7974c77	SCPN1-7065 (cherry picked from commit `ca33a85694`)	2024-08-29 10:37:54 +02:00
freat	087346139d	Release 1.2.25+1	2024-08-08 16:55:33 +02:00
freat	0a4263d551	Release 1.2.24+1	2024-08-07 12:23:46 +02:00
@@ -1 +1 @@
 .2.23+2
 .2.25+2