1151 Commits

Author SHA1 Message Date
ae47fda38f modif sur les rdz 2025-11-18 10:48:46 +01:00
f57276f088 Merge branch 'develop-rdz' into 'develop'
modif sur les rdz

See merge request r-d-technique/tiers/reflex-wms-connector!167
2025-11-18 09:42:04 +00:00
138dd801d2 modif sur les rdz 2025-11-18 10:41:35 +01:00
db0e4df78d Merge branch 'develop-rdz' into 'develop'
Develop rdz

See merge request r-d-technique/tiers/reflex-wms-connector!166
2025-11-17 16:59:10 +00:00
5df1ebe54b Merge branch 'develop' into develop-rdz 2025-11-17 17:58:40 +01:00
4bfd6e7a4f modif sur les rdz 2025-11-17 17:58:20 +01:00
cdab58da71 Merge branch 'develop-rdz' into 'develop'
modif sur les rdz

See merge request r-d-technique/tiers/reflex-wms-connector!165
2025-11-17 16:39:36 +00:00
065d4c026b modif sur les rdz 2025-11-17 17:39:15 +01:00
b930c0eb40 Merge branch 'develop-rdz' into 'develop'
Develop rdz

See merge request r-d-technique/tiers/reflex-wms-connector!164
2025-11-17 16:32:00 +00:00
6c1a19ad04 Merge branch 'develop' into develop-rdz 2025-11-17 17:31:39 +01:00
7ff859420a modif sur les rdz 2025-11-17 17:31:23 +01:00
789e2e6c19 Merge branch 'develop-rdz' into 'develop'
modif sur les rdz

See merge request r-d-technique/tiers/reflex-wms-connector!163
2025-11-17 09:05:02 +00:00
1dcf91bf71 modif sur les rdz 2025-11-17 10:02:33 +01:00
068ef56d25 Merge branch 'develop-rdz' into 'develop'
Develop rdz

See merge request r-d-technique/tiers/reflex-wms-connector!162
2025-11-17 08:46:03 +00:00
c9050d837a Merge branch 'develop' into develop-rdz 2025-11-17 09:45:24 +01:00
e83186cc3f modif sur les rdz 2025-11-17 09:45:06 +01:00
355e170831 Merge branch 'develop-rdz' into 'develop'
Develop rdz

See merge request r-d-technique/tiers/reflex-wms-connector!161
2025-11-14 13:32:28 +00:00
53006d3fa1 Merge branch 'develop' into develop-rdz
# Conflicts:
#	RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
2025-11-14 14:29:40 +01:00
4648c02a2c modif sur les rdz 2025-11-14 14:27:33 +01:00
8f8f26d2a2 mails 2025-11-13 10:09:11 +01:00
b4f11ef83d SCPN1-8643 2025-11-13 10:02:56 +01:00
a2fd6f1145 Merge branch 'develop' into develop-rdz
# Conflicts:
#	RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
2025-11-12 17:14:12 +01:00
bd7b24fed7 modif sur les rdz 2025-11-12 17:10:56 +01:00
9c38272c6c SCPN1-9640 2025-11-12 16:37:15 +01:00
e09c0fecda SCPN1-9640 2025-11-12 16:33:27 +01:00
5477fbd66a SCPN1-8643 2025-11-12 16:30:59 +01:00
a151a0b655 Revert "SCPN1-9640"
This reverts commit 894031cc496634f5f5d2a63d043f4cc7a72b0613.
2025-11-10 14:45:26 +01:00
bf365ba170 SCPN1-9640 2025-11-10 14:23:57 +01:00
894031cc49 SCPN1-9640 2025-11-10 14:22:40 +01:00
d895bac137 version 1 des FTL des RDZ 2025-11-07 10:07:21 +01:00
ec844cbe49 Merge branch 'release/2.0' into 'main-2.0'
Release/2.0 to main2.0

See merge request r-d-technique/tiers/reflex-wms-connector!159
2025-11-06 10:11:10 +00:00
ab9e892640 Release 2.0.11+1 v2.0.11+1 2025-11-06 11:09:15 +01:00
39c8280fa4 Merge branch 'release/2.0' into 'main-2.0'
Release/2.0 to main2.0

See merge request r-d-technique/tiers/reflex-wms-connector!157
2025-11-04 09:35:47 +00:00
00f34c1bc2 Release 2.0.10+2 v2.0.10+2 2025-11-04 10:31:20 +01:00
0406c9b8cc Merge branch 'release2.0-SCPN1-9601' into 'release/2.0'
release 2.0 SCPN1-9601

See merge request r-d-technique/tiers/reflex-wms-connector!156
2025-11-04 09:28:21 +00:00
ceb33abfca SCPN1-9601
(cherry picked from commit 9214df8b96ef9f8864bae3d7ab49ca4fdc6f6c43)
2025-11-04 10:22:37 +01:00
9214df8b96 SCPN1-9601 2025-11-04 10:02:37 +01:00
bfbf654ee2 SCPN1-9577 2025-10-30 14:47:34 +01:00
0adef4a1f3 Brand 2025-10-30 11:50:35 +01:00
7cbc5111e9 Merge branch 'release/2.0' into 'main-2.0'
Release/2.0 to main2.0

See merge request r-d-technique/tiers/reflex-wms-connector!155
2025-10-29 09:49:58 +00:00
9521679a8d Release 2.0.10+1 2025-10-29 10:48:35 +01:00
0d3b459386 Merge branch 'release/2.0' into 'main-2.0'
Release/2.0 to main 2.0

See merge request r-d-technique/tiers/reflex-wms-connector!152
2025-10-24 08:41:23 +00:00
3dfb366ac7 Release 2.0.9+1 2025-10-24 10:38:43 +02:00
5b6d3749bc Merge branch 'release2.0-SCPN1-9399' into 'release/2.0'
SCPN1-9399 to release 2.0

See merge request r-d-technique/tiers/reflex-wms-connector!147
2025-10-24 08:34:57 +00:00
cc7da39c20 json_string order
(cherry picked from commit d116ab3856fd765f1f1f5588a6b2b2ecf5cde0a1)
2025-10-22 17:02:03 +02:00
e9c7594555 SCPN1-9399SCPN1-9399 2025-10-22 16:19:05 +02:00
18473a26a1 SCPN1-9399 2025-10-22 16:14:56 +02:00
a46b06fa3d SCPN1-9399 2025-10-22 14:59:19 +02:00
ebd45f67bc SCPN1-9399 2025-10-22 14:56:11 +02:00
d116ab3856 json_string order 2025-10-22 14:29:37 +02:00