Commit Graph

898 Commits

Author SHA1 Message Date
f829a02d98 Merge branch 'Release-1.2-V14' into 'release/1.2'
Release 1.2 V 14

See merge request r-d-technique/tiers/reflex-wms-connector!284
2026-06-29 15:07:26 +00:00
11c928e257 Merge branch 'develop-1.2' into Release-1.2-V14 2026-06-29 17:02:39 +02:00
7c9321002f Merge branch 'develop-1.2' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop-1.2 2026-06-29 15:56:58 +02:00
d4e5910933 CMD 2026-06-29 15:56:52 +02:00
65fca99577 SCPN1-10882
(cherry picked from commit d380ec91f8)
2026-06-25 13:56:51 +02:00
89be22e1e1 Merge branch 'develop-1.2' into Release-1.2-V14
# Conflicts:
#	ActorPrefix.ftl
#	RFXtoRP_HsaDesPatch.ftl
#	RFXtoRP_HsaDespNt.ftl
#	RFXtoRP_HsrLoadInfo.ftl
#	RFXtoRP_HsrPackBranch.ftl
#	RFXtoRP_HsrPackOrder.ftl
2026-06-22 13:38:41 +02:00
a4b5a1dbf0 SCPN1-10671 2026-05-12 18:00:59 +02:00
5e3633aaa1 Release 1.2.60+6 2026-05-12 17:47:46 +02:00
abe628a3b0 Merge branch 'release1.2-fix4-v13' into 'release/1.2'
Fix4 v13

See merge request r-d-technique/tiers/reflex-wms-connector!282
2026-05-12 15:45:03 +00:00
779b4d0596 Fix4 v13 2026-05-12 17:38:32 +02:00
ff7a38fc1f Release 1.2.60+5 v1.2.60+5 2026-05-12 14:52:30 +02:00
49365d0879 Merge branch 'release1.2-fix4-v13' into 'release/1.2'
release1.2-fix4-v13 into release/1.2

See merge request r-d-technique/tiers/reflex-wms-connector!278
2026-05-12 12:48:16 +00:00
77ef62f002 Fix4 v13 2026-05-12 14:27:55 +02:00
e3f829683f SCPN1-10706 2026-05-12 11:32:55 +02:00
2512bdda84 SCPN1-10765 2026-05-12 10:27:46 +02:00
9618f5bffb SCPN1-10706 2026-05-12 10:14:53 +02:00
7563a1e932 SCPN1-10765 2026-05-11 17:26:42 +02:00
e73a2ccd83 SCPN1-10736 2026-05-05 14:11:06 +02:00
e75658e7ac SCPN1-10736 2026-05-05 10:56:55 +02:00
e1981b8fbd SCPN1-10671 2026-04-30 15:29:45 +02:00
7942a0dfc0 Release 1.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 51fdb6d382)
2026-04-28 09:53:57 +02:00
285d5ff330 Merge branch 'develop-1.2' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop-1.2 2026-04-28 09:48:32 +02:00
51fdb6d382 SCPN1-10682 2026-04-28 09:48:27 +02:00
d96c2c73c1 SCPN1-10671
(cherry picked from commit 9916545817)
2026-04-27 10:47:28 +02: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
012c4007c7 Release 1.2.60+2 v1.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
86b209e56e Release 1.2.60+1 v1.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
f2ef0553b7 SCPN1-10586 2026-04-20 13:48:04 +02:00
Vincent LE MAÎTRE
05a944250c Release 1.2.59+1 v1.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