Release 1.2.29+3

SCPN1-7578

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

RFXtoRP_HsaIpgMove_StockMoved.ftl

@@ -57,7 +57,7 @@
         "Quantity":
         {
         "LVID": "${quantity_in_base_lv_RP_Cst}",
-        <#if reflexMvtStockInterface.move_sign == "+">
+        <#if reflexMvtStockInterface.move_sign == "+" || reflexMvtStockInterface.ipg_move_quantity_in_base_lvs <= 0 >
           "Value": ${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs}
         <#else>
           "Value": -${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs}

RFXtoRP_HsrPro_ExecutionflowDetected.ftl

@@ -56,8 +56,13 @@
               "Address" :
                 {
                  "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}",
-                 "CountryCode" : "${preparation_order.address.iso_country_code!""}",
+                 <#assign isCountryCode = JsonUtil.isCountryCode(preparation_order.address.iso_country_code?upper_case) />
-                 "PostalCode" : "${preparation_order.address.postal_code!""}",
+                 <#if isCountryCode>
+                 "CountryCode" : "${(preparation_order.address.iso_country_code!"")?json_string}",
+                 <#else>
+                  "CountryCode" : "",
+                 </#if>
+                 "PostalCode" : "${(preparation_order.address.postal_code!"")?json_string}",
                  "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}",
                  "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}",
                  "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}"

RFXtoRP_RfxConfigurationRp.ftl

@@ -33,4 +33,11 @@
  <#noparse><#assign text_language_rfx   = </#noparse>"${reflex_platform_project.text_language!"en"}<#noparse>"></#noparse>
 </#list>
 
+<#list file.reflex_platform_project_list?filter(j -> j.name == projectRP) as reflex_platform_project_uniqueness>
+ <#if reflex_platform_project_uniqueness.site_code_unicity??>
+<#noparse><#assign uniqueness = </#noparse>${reflex_platform_project_uniqueness.site_code_unicity?c}<#noparse>></#noparse>
+<#else>
+    <#noparse><#assign uniqueness = </#noparse>false<#noparse>></#noparse>
+</#if>
+</#list>
 

RPtoRFX_PrepOrder.ftl

@@ -54,12 +54,16 @@
 				"address_type_code" : "${adresstypecode}",
 				"first_name": "${(executionflow.ShipTo.Contact.FirstName!"")?json_string}",
 				"last_name" :"${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
-				"name_or_company_name" : "${(executionflow.ShipTo.Contact.FirstName!"")?json_string} ${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
+				<#if executionflow.ShipTo.Actor.Address.Name?? && executionflow.ShipTo.Actor.Address.Name!="">
+					"name_or_company_name" : "${(executionflow.ShipTo.Actor.Address.Name!"")?json_string}",
+				<#else>
+					"name_or_company_name" : "${(executionflow.ShipTo.Contact.FirstName!"")?json_string} ${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
+				</#if>
 				<#if executionflow.ShipTo.Contact.Emails?? && executionflow.ShipTo.Contact.Emails[0]!="">
-					"mail_address": "${executionflow.ShipTo.Contact.Emails[0]}",
+					"mail_address": "${executionflow.ShipTo.Contact.Emails[0]?json_string}",
 				</#if>
 				<#if executionflow.ShipTo.Contact.Phones?? && executionflow.ShipTo.Contact.Phones[0]!="">
-					"mobile_phone_number": "${executionflow.ShipTo.Contact.Phones[0]}",
+					"mobile_phone_number": "${executionflow.ShipTo.Contact.Phones[0]?json_string}",
 				</#if>
 				"street_and_number_and_po_box": "${(executionflow.ShipTo.Actor.Address.StreetAddressOne!"")?json_string}",
 				"additional_address_data_1": "${(executionflow.ShipTo.Actor.Address.StreetAddressTwo!"")?json_string}",

VERSION

@@ -1 +1 @@
-1.2.28+1
+1.2.29+3