Commit Graph

909 Commits

Author SHA1 Message Date
7bf0d63d71 Merge branch 'release/1.2' into 'main-1.2'
release/1.2 into main-1.2

See merge request r-d-technique/tiers/reflex-wms-connector!276
2026-04-28 08:20:10 +00:00
7942a0dfc0 Release 1.2.60+4 v1.2.60+4 2026-04-28 10:17:47 +02:00
16a6ad77c1 Merge branch 'release-1.2-SCPN1-10682' into 'release/1.2'
release-1.2-SCPN1-10682

See merge request r-d-technique/tiers/reflex-wms-connector!275
2026-04-28 08:12:57 +00:00
8d87e02969 SCPN1-10682
(cherry picked from commit 51fdb6d38250095825f9d31d1cfc9d52e3e4bb1a)
2026-04-28 09:53:57 +02:00
1aea681783 Merge branch 'release/1.2' into 'main-1.2'
release/1.2 into main-1.2

See merge request r-d-technique/tiers/reflex-wms-connector!272
2026-04-24 09:14:05 +00:00
959a0d02a8 Release 1.2.60+3 v1.2.60+3 2026-04-24 11:12:50 +02:00
ed1d989b2d Merge branch 'Release-1.2-SCPN1-10159' into 'release/1.2'
Release-1.2-SCPN1-10159 into release/1.2

See merge request r-d-technique/tiers/reflex-wms-connector!271
2026-04-24 09:05:06 +00:00
f490cce345 Merge branch 'develop-1.2' into Release-1.2-SCPN1-10159 2026-04-24 09:58:40 +02:00
2a70e2ca76 back SCPN1 10519
(cherry picked from commit 2b25c4853d)
2026-04-24 09:43:40 +02:00
a25e4046a3 back SCPN1-10519 2026-04-24 09:31:22 +02:00
f8b0538588 Merge branch 'release/1.2' into 'main-1.2'
release/1.2 into main-1.2

See merge request r-d-technique/tiers/reflex-wms-connector!269
2026-04-23 07:12:27 +00:00
012c4007c7 Release 1.2.60+2 2026-04-23 09:11:07 +02:00
f131a91b36 Merge branch 'release1.2-SCPN1-10621' into 'release/1.2'
SCPN1-10586

See merge request r-d-technique/tiers/reflex-wms-connector!268
2026-04-23 07:07:11 +00:00
b7d97fbd63 SCPN1-10586 2026-04-22 17:59:40 +02:00
b594dc3f7e Merge branch 'release/1.2' into 'main-1.2'
Release/1.2 into main 1.2

See merge request r-d-technique/tiers/reflex-wms-connector!266
2026-04-22 07:43:18 +00:00
86b209e56e Release 1.2.60+1 2026-04-22 09:41:41 +02:00
33e1abe3e1 Merge branch 'release1.2-SCPN1-10621' into 'release/1.2'
SCPN1-10621 into "Release1.2 "

See merge request r-d-technique/tiers/reflex-wms-connector!264
2026-04-22 07:21:10 +00:00
498fd030a6 SCPN1-10586 2026-04-21 08:35:05 +02:00
fc78dbdb66 SCPN1-10586 2026-04-20 16:40:44 +02:00
8721201385 Merge branch 'release/1.2' into 'main-1.2'
release/1.2 into main-1.2

See merge request r-d-technique/tiers/reflex-wms-connector!262
2026-04-20 12:24:33 +00:00
f2ef0553b7 SCPN1-10586 2026-04-20 13:48:04 +02:00
05a944250c Release 1.2.59+1 2026-04-20 13:44:28 +02:00
2ef220f2ca Merge branch 'release-1.2-v13' into 'release/1.2'
release-1.2-v13 into release/1.2

See merge request r-d-technique/tiers/reflex-wms-connector!260
2026-04-20 09:44:06 +00:00
f4cb551271 Merge branch 'develop-1.2' into release-1.2-v13
# Conflicts:
#	RFXtoRP_HsaItm_ItemCreated.ftl
#	RFXtoRP_HsrCarrierApt_AppointmentCarrierInformationUpdatedToConfigure.ftl
#	RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl
#	RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
#	RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl
#	RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl
#	RFXtoRP_PlatformLogCreate.ftl
#	RPtoRFX_AppointmentEvent.ftl
#	RPtoRFX_CarrierAppointmentCreated.ftl
#	RPtoRFX_CarrierAppointmentReasonUpdatedByNumber.ftl
#	RPtoRFX_CarrierAppointmentReasonUpdatedByRef.ftl
#	RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl
#	RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl
#	RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl
2026-04-20 11:17:43 +02:00
6353ffa18f SCPN1-10586 2026-04-17 17:17:45 +02:00
2b443f56a5 SCPN1-10586 2026-04-17 14:17:20 +02:00
4d70e05947 Merge branch 'develop-1.2' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop-1.2 2026-04-17 10:59:55 +02:00
6eebe5c805 SCPN1-10586 2026-04-17 10:59:47 +02:00
9a9e6922da SCPN1-10586
(cherry picked from commit 2bfb866dcc)
2026-04-16 17:36:06 +02:00
af5775375e SCPN1-10586
(cherry picked from commit 13fe55ae1a)
2026-04-16 17:17:55 +02:00
f29f1b6dc4 SCPN1-10579 2026-04-14 15:18:20 +02:00
6fac2a7a2c SCPN1-10579 2026-04-14 14:35:04 +02:00
7f6fb9b63a SCPN1-10560
(cherry picked from commit 8e1d0e3a17)
2026-04-13 15:11:23 +02:00
a570da2699 espace 2026-04-03 16:17:36 +02:00
0795d36caa SCPN1-10402
(cherry picked from commit 4e3162556c)
2026-04-03 14:31:15 +02:00
f30e7b94d3 SCPN1-10402 2026-03-31 17:54:52 +02:00
45904e8b6f SCPN1-10402 2026-03-31 09:46:33 +02:00
71e4b030f7 Merge branch 'develop' into develop-1.2
# Conflicts:
#	README.md
#	RFXtoRP_HfDtlStockLs.ftl
#	RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl
#	RFXtoRP_HliPrepaL.ftl
#	RFXtoRP_HliReceiptLr.ftl
#	RFXtoRP_HliReceiptLr_ExecutionflowLinesAdded.ftl
#	RFXtoRP_HlrProL.ftl
#	RFXtoRP_HlrProL_ExecutionflowLinesAdded.ftl
#	RFXtoRP_HsaCarrier.ftl
#	RFXtoRP_HsaCarrier_ActorCreated.ftl
#	RFXtoRP_HsaCons.ftl
#	RFXtoRP_HsaCons_ActorCreated.ftl
#	RFXtoRP_HsaDesPatch.ftl
#	RFXtoRP_HsaDespNt.ftl
#	RFXtoRP_HsaDispute.ftl
#	RFXtoRP_HsaDispute_Created.ftl
#	RFXtoRP_HsaIpgMove_GoodsReceived.ftl
#	RFXtoRP_HsaIpgMove_StockMoved_SegmentationKeys.ftl
#	RFXtoRP_HsaLstCarSta.ftl
#	RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl
#	RFXtoRP_HsaProStatus.ftl
#	RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
#	RFXtoRP_HsaProStatus_PreparationCompleted.ftl
#	RFXtoRP_HsaProStatus_PreparationExpected.ftl
#	RFXtoRP_HsaProStatus_PreparationStarted.ftl
#	RFXtoRP_HsaProStatus_TransportStarted.ftl
#	RFXtoRP_HsaSup_ActorCreated.ftl
#	RFXtoRP_HsrCarrierApt.ftl
#	RFXtoRP_HsrCarrierApt_AppointmentCarrierInformationUpdatedToConfigure.ftl
#	RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl
#	RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl
#	RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
#	RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
#	RFXtoRP_HsrCarrierApt_CarrierDeparted.ftl
#	RFXtoRP_HsrCarrierApt_LoadingCompleted.ftl
#	RFXtoRP_HsrCarrierApt_UnloadingCompleted.ftl
#	RFXtoRP_HsrCarrierApt_UnloadingStarted.ftl
#	RFXtoRP_HsrDepot_ActorCreated.ftl
#	RFXtoRP_HsrLoadInfo.ftl
#	RFXtoRP_HsrPrepa.ftl
#	RFXtoRP_HsrPrepa_CarrierUpdated.ftl
#	RFXtoRP_HsrPrepa_ExecutionflowMetadataUpdated.ftl
#	RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
#	RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
#	RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
#	RFXtoRP_HsrPro.ftl
#	RFXtoRP_HsrPro_ExecutionflowDetected.ftl
#	RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl
#	RFXtoRP_HsrReceiptList.ftl
#	RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
#	RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
#	RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl
#	RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl
#	RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
#	RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
#	RFXtoRP_RestResponse.ftl
#	RPtoRFX_AppointmentEvent.ftl
#	RPtoRFX_CarrierAppointmentCreated.ftl
#	RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl
#	RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl
#	RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByNumber.ftl
#	RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl
#	RPtoRFX_CarrierAppointmentReasonUpdatedByNumber.ftl
#	RPtoRFX_CarrierAppointmentReasonUpdatedByRef.ftl
#	RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl
#	RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl
#	RPtoRFX_ExecutionflowEvent.ftl
#	RPtoRFX_PrepOrder_HeaderMetadata.ftl
#	RPtoRFX_PrepOrder_LineMetadata.ftl
#	RPtoRFX_Receipt.ftl
#	RPtoRFX_Receipt_HeaderMetadata.ftl
#	RPtoRFX_Receipt_LineMetadata.ftl
#	RPtoRFX_Receipt_OptionalAttributes.ftl
#	ReflexUtils.ftl
2026-03-31 09:32:40 +02:00
13b23c5819 SCPN1-9218 2026-03-24 17:17:52 +01:00
1be32968f2 SCPN1-10443 2026-03-20 13:28:08 +01:00
e269d41ccd SCPN1-10443 2026-03-19 14:30:08 +01:00
f48dc006d3 SCPN1-10459 2026-03-19 11:51:22 +01:00
fba2b820ac SCPN1-10443 2026-03-19 10:35:48 +01:00
3c6dd780de SCPN1-10443 2026-03-19 10:24:10 +01:00
326390e93d SCPN1-10443 2026-03-19 10:14:55 +01:00
06bcfecad6 SCPN1-10443 2026-03-19 10:08:13 +01:00
76d3db411f SCPN1-10443 2026-03-19 09:54:55 +01:00
c04e562c46 SCPN1-10408 2026-03-10 10:43:35 +01:00
21f622dfa2 Merge branch 'release/1.2' into 'main-1.2'
release/1.2 into main-1.2

See merge request r-d-technique/tiers/reflex-wms-connector!255
2026-03-04 14:00:41 +00:00
35550c4e34 Release 1.2.58+3 v1.2.58+3 2026-03-04 14:59:22 +01:00