From 0fe9bc942244adcbe7f462b4d36a58baff30c2de Mon Sep 17 00:00:00 2001
From: jbpenrath <jb.penrath@gmail.com>
Date: Tue, 22 Oct 2024 15:32:40 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=96(minor)=20bump=20joanie=20to=20vers?=
 =?UTF-8?q?ion=202.9.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added
- Add index on `template` field of the `CertificateDefinition` model
- Add `appendix` field on `ContractDefinition` model
- Allow to edit `appendix` `ContractDefinition` field through the back office

Changed
- Improve performance of the certificate client API endpoint
- Make payment backend request timeout configurable
---
 CHANGELOG.md                                  |  11 ++-
 arnold.yml                                    |   2 +-
 .../locale/es_ES/LC_MESSAGES/django.mo        | Bin 463 -> 463 bytes
 .../locale/es_ES/LC_MESSAGES/django.po        |  82 +++++++++--------
 .../locale/fr_CA/LC_MESSAGES/django.mo        | Bin 469 -> 469 bytes
 .../locale/fr_CA/LC_MESSAGES/django.po        |  82 +++++++++--------
 .../locale/fr_FR/LC_MESSAGES/django.mo        | Bin 42770 -> 42880 bytes
 .../locale/fr_FR/LC_MESSAGES/django.po        |  84 ++++++++++--------
 src/backend/pyproject.toml                    |   2 +-
 src/frontend/admin/i18n/locales/es-ES.json    |   4 +
 src/frontend/admin/i18n/locales/fr-CA.json    |   4 +
 src/frontend/admin/i18n/locales/fr-FR.json    |   4 +
 src/frontend/admin/package.json               |   2 +-
 .../admin/src/translations/es-ES.json         |   1 +
 .../admin/src/translations/fr-CA.json         |   1 +
 .../admin/src/translations/fr-FR.json         |   1 +
 src/mail/package.json                         |   2 +-
 src/openApiClientJs/package.json              |   2 +-
 src/tray/tray.yml                             |   2 +-
 src/tray/vars/all/main.yml                    |   4 +-
 20 files changed, 166 insertions(+), 124 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6f52b1fe..b4bcb8a45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,13 +8,17 @@ and this project adheres to
 
 ## [Unreleased]
 
+## [2.9.0] - 2024-10-22
+
 ### Added
 
+- Add index on `template` field of the `CertificateDefinition` model
 - Add `appendix` field on `ContractDefinition` model
 - Allow to edit `appendix` `ContractDefinition` field through the back office
 
 ### Changed
 
+- Improve performance of the certificate client API endpoint
 - Make payment backend request timeout configurable
 
 ## [2.8.0] - 2024-10-16
@@ -31,7 +35,6 @@ and this project adheres to
   paid
 - Support of payment_schedule for certificate products
 - Display payment schedule in contract template
-- Add index on `template` field of the `CertificateDefinition` model
 
 ### Changed
 
@@ -46,8 +49,7 @@ and this project adheres to
   payments of installments that are in the past
 - Deprecated field `has_consent_to_terms` for `Order` model
 - Move signature fields before appendices in contract definition template
-- Update `handle_notification` signature backend to confirm signature 
-- Improve performance of the certificate client API endpoint
+- Update `handle_notification` signature backend to confirm signature
 
 ### Fixed
 
@@ -463,7 +465,8 @@ and this project adheres to
 - First working version serving sellable micro-credentials for multiple
   organizations synchronized to a remote catalog
 
-[unreleased]: https://github.com/openfun/joanie/compare/v2.8.0...main
+[unreleased]: https://github.com/openfun/joanie/compare/v2.9.0...main
+[2.9.0]: https://github.com/openfun/joanie/compare/v2.8.0...v2.9.0
 [2.8.0]: https://github.com/openfun/joanie/compare/v2.7.1...v2.8.0
 [2.7.1]: https://github.com/openfun/joanie/compare/v2.7.0...v2.7.1
 [2.7.0]: https://github.com/openfun/joanie/compare/v2.6.1...v2.7.0
diff --git a/arnold.yml b/arnold.yml
index c83ffe053..4f026c8ac 100644
--- a/arnold.yml
+++ b/arnold.yml
@@ -1,6 +1,6 @@
 # arnold.yml
 metadata:
   name: joanie
-  version: 2.8.0
+  version: 2.9.0
 source:
   path: src/tray
diff --git a/src/backend/locale/es_ES/LC_MESSAGES/django.mo b/src/backend/locale/es_ES/LC_MESSAGES/django.mo
index 853ad5e99172392b276c7d578c09b84c4f88e3e4..1fef410fe02e8920e7a6a61d77445a2344710ec4 100755
GIT binary patch
delta 19
acmX@le4cqiD~FMhf}ydMk>$o-Cq@82kp<8I

delta 19
acmX@le4cqiD~F+(f`O%#iP^?pCq@82)dkl8

diff --git a/src/backend/locale/es_ES/LC_MESSAGES/django.po b/src/backend/locale/es_ES/LC_MESSAGES/django.po
index 690e4f567..d56c05787 100644
--- a/src/backend/locale/es_ES/LC_MESSAGES/django.po
+++ b/src/backend/locale/es_ES/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: joanie\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-16 09:22+0000\n"
-"PO-Revision-Date: 2024-10-16 09:46\n"
+"POT-Creation-Date: 2024-10-22 13:22+0000\n"
+"PO-Revision-Date: 2024-10-22 13:29\n"
 "Last-Translator: \n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
@@ -204,7 +204,7 @@ msgid "Enrollment"
 msgstr ""
 
 #: joanie/core/enums.py:37 joanie/core/enums.py:150
-#: joanie/core/models/certifications.py:116
+#: joanie/core/models/certifications.py:117
 #: joanie/core/templates/issuers/degree.html:27
 msgid "Certificate"
 msgstr ""
@@ -328,15 +328,15 @@ msgstr ""
 msgid "Refused"
 msgstr ""
 
-#: joanie/core/factories.py:1141 joanie/core/utils/contract_definition.py:101
+#: joanie/core/factories.py:1142 joanie/core/utils/contract_definition.py:101
 msgid "<COURSE_START_DATE>"
 msgstr ""
 
-#: joanie/core/factories.py:1146 joanie/core/utils/contract_definition.py:102
+#: joanie/core/factories.py:1147 joanie/core/utils/contract_definition.py:102
 msgid "<COURSE_END_DATE>"
 msgstr ""
 
-#: joanie/core/factories.py:1153
+#: joanie/core/factories.py:1154
 msgid "<EFFORT_DURATION>"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgid_plural "%d products to synchronize."
 msgstr[0] ""
 msgstr[1] ""
 
-#: joanie/core/models/accounts.py:34 joanie/core/models/contracts.py:35
+#: joanie/core/models/accounts.py:34 joanie/core/models/contracts.py:36
 msgid "language"
 msgstr ""
 
@@ -453,7 +453,7 @@ msgstr ""
 msgid "owner"
 msgstr ""
 
-#: joanie/core/models/accounts.py:171 joanie/core/models/certifications.py:97
+#: joanie/core/models/accounts.py:171 joanie/core/models/certifications.py:98
 #: joanie/core/models/products.py:409
 msgid "organization"
 msgstr ""
@@ -495,7 +495,7 @@ msgid "level"
 msgstr ""
 
 #: joanie/core/models/activity_logs.py:74
-#: joanie/core/models/certifications.py:108 joanie/core/models/contracts.py:96
+#: joanie/core/models/certifications.py:109 joanie/core/models/contracts.py:103
 #: joanie/payment/models.py:74
 msgid "context"
 msgstr ""
@@ -565,37 +565,37 @@ msgstr ""
 msgid "template to generate pdf"
 msgstr ""
 
-#: joanie/core/models/certifications.py:46
-#: joanie/core/models/certifications.py:70
+#: joanie/core/models/certifications.py:47
+#: joanie/core/models/certifications.py:71
 msgid "Certificate definition"
 msgstr ""
 
-#: joanie/core/models/certifications.py:47
+#: joanie/core/models/certifications.py:48
 msgid "Certificate definitions"
 msgstr ""
 
-#: joanie/core/models/certifications.py:65
+#: joanie/core/models/certifications.py:66
 msgid "Date of issuance"
 msgstr ""
 
-#: joanie/core/models/certifications.py:82 joanie/core/models/contracts.py:86
+#: joanie/core/models/certifications.py:83 joanie/core/models/contracts.py:93
 #: joanie/core/models/products.py:1276 joanie/payment/models.py:54
 msgid "order"
 msgstr ""
 
-#: joanie/core/models/certifications.py:91 joanie/core/models/products.py:431
+#: joanie/core/models/certifications.py:92 joanie/core/models/products.py:431
 msgid "enrollment"
 msgstr ""
 
-#: joanie/core/models/certifications.py:102 joanie/core/models/contracts.py:46
+#: joanie/core/models/certifications.py:103 joanie/core/models/contracts.py:47
 msgid "images"
 msgstr ""
 
-#: joanie/core/models/certifications.py:109
+#: joanie/core/models/certifications.py:110
 msgid "Localized data that needs to be frozen on certificate creation"
 msgstr ""
 
-#: joanie/core/models/certifications.py:117
+#: joanie/core/models/certifications.py:118
 msgid "Certificates"
 msgstr ""
 
@@ -603,52 +603,56 @@ msgstr ""
 msgid "body"
 msgstr ""
 
-#: joanie/core/models/contracts.py:36
+#: joanie/core/models/contracts.py:32
+msgid "appendix"
+msgstr ""
+
+#: joanie/core/models/contracts.py:37
 msgid "Language of the contract definition"
 msgstr ""
 
-#: joanie/core/models/contracts.py:39
+#: joanie/core/models/contracts.py:40
 msgid "template name"
 msgstr ""
 
-#: joanie/core/models/contracts.py:54 joanie/core/models/contracts.py:79
+#: joanie/core/models/contracts.py:55 joanie/core/models/contracts.py:86
 #: joanie/core/models/products.py:105
 msgid "Contract definition"
 msgstr ""
 
-#: joanie/core/models/contracts.py:55
+#: joanie/core/models/contracts.py:56
 msgid "Contract definitions"
 msgstr ""
 
-#: joanie/core/models/contracts.py:98
+#: joanie/core/models/contracts.py:105
 msgid "Localized data snapshot on contract signature"
 msgstr ""
 
-#: joanie/core/models/contracts.py:108
+#: joanie/core/models/contracts.py:115
 msgid "Reference in the external signature backend"
 msgstr ""
 
-#: joanie/core/models/contracts.py:113
+#: joanie/core/models/contracts.py:120
 msgid "Date and time we send the contract to signature provider"
 msgstr ""
 
-#: joanie/core/models/contracts.py:121
+#: joanie/core/models/contracts.py:128
 msgid "Date and time of issuance"
 msgstr ""
 
-#: joanie/core/models/contracts.py:127
+#: joanie/core/models/contracts.py:134
 msgid "organization signatory"
 msgstr ""
 
-#: joanie/core/models/contracts.py:135
+#: joanie/core/models/contracts.py:142
 msgid "Date and time the organization signed the contract"
 msgstr ""
 
-#: joanie/core/models/contracts.py:143
+#: joanie/core/models/contracts.py:150
 msgid "Contract"
 msgstr ""
 
-#: joanie/core/models/contracts.py:144
+#: joanie/core/models/contracts.py:151
 msgid "Contracts"
 msgstr ""
 
@@ -1343,7 +1347,7 @@ msgstr ""
 msgid "Appendices"
 msgstr ""
 
-#: joanie/core/templates/issuers/contract_definition.html:144
+#: joanie/core/templates/issuers/contract_definition.html:147
 #: joanie/core/templates/mail/html/installment_paid.html:259
 #: joanie/core/templates/mail/html/installment_refused.html:235
 #: joanie/core/templates/mail/html/installment_reminder.html:235
@@ -1355,19 +1359,19 @@ msgstr ""
 msgid "Payment schedule"
 msgstr ""
 
-#: joanie/core/templates/issuers/contract_definition.html:148
+#: joanie/core/templates/issuers/contract_definition.html:151
 msgid "Due date"
 msgstr ""
 
-#: joanie/core/templates/issuers/contract_definition.html:149
+#: joanie/core/templates/issuers/contract_definition.html:152
 msgid "Amount"
 msgstr ""
 
-#: joanie/core/templates/issuers/contract_definition.html:155
+#: joanie/core/templates/issuers/contract_definition.html:158
 msgid "Total :"
 msgstr ""
 
-#: joanie/core/templates/issuers/contract_definition.html:173
+#: joanie/core/templates/issuers/contract_definition.html:176
 msgid "Catalog syllabus"
 msgstr ""
 
@@ -1789,14 +1793,18 @@ msgid "<STUDENT_PHONE_NUMBER>"
 msgstr ""
 
 #: joanie/core/utils/contract_definition.py:112
-msgid "<CONTRACT_BODY>"
+msgid "&lt;CONTRACT_BODY&gt;"
 msgstr ""
 
 #: joanie/core/utils/contract_definition.py:113
-msgid "<CONTRACT_TITLE>"
+msgid "&lt;CONTRACT_APPENDIX&gt;"
 msgstr ""
 
 #: joanie/core/utils/contract_definition.py:114
+msgid "<CONTRACT_TITLE>"
+msgstr ""
+
+#: joanie/core/utils/contract_definition.py:115
 msgid "<CONTRACT_DESCRIPTION>"
 msgstr ""
 
diff --git a/src/backend/locale/fr_CA/LC_MESSAGES/django.mo b/src/backend/locale/fr_CA/LC_MESSAGES/django.mo
index 4fea18224d7a9a02082e21590b0d6351dedaf9a0..216aae43a0f2b8b3954534524e86ca49780163c1 100755
GIT binary patch
delta 19
acmcc0e3f}ZD~FMhf}ydMk>$o-4@Lk$bp_%8

delta 19
acmcc0e3f}ZD~F+(f`O%#iP^?p4@Lk$xdrI}

diff --git a/src/backend/locale/fr_CA/LC_MESSAGES/django.po b/src/backend/locale/fr_CA/LC_MESSAGES/django.po
index 0a64cb0a6..9493c9960 100644
--- a/src/backend/locale/fr_CA/LC_MESSAGES/django.po
+++ b/src/backend/locale/fr_CA/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: joanie\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-16 09:22+0000\n"
-"PO-Revision-Date: 2024-10-16 09:46\n"
+"POT-Creation-Date: 2024-10-22 13:22+0000\n"
+"PO-Revision-Date: 2024-10-22 13:29\n"
 "Last-Translator: \n"
 "Language-Team: French, Canada\n"
 "Language: fr_CA\n"
@@ -204,7 +204,7 @@ msgid "Enrollment"
 msgstr ""
 
 #: joanie/core/enums.py:37 joanie/core/enums.py:150
-#: joanie/core/models/certifications.py:116
+#: joanie/core/models/certifications.py:117
 #: joanie/core/templates/issuers/degree.html:27
 msgid "Certificate"
 msgstr ""
@@ -328,15 +328,15 @@ msgstr ""
 msgid "Refused"
 msgstr ""
 
-#: joanie/core/factories.py:1141 joanie/core/utils/contract_definition.py:101
+#: joanie/core/factories.py:1142 joanie/core/utils/contract_definition.py:101
 msgid "<COURSE_START_DATE>"
 msgstr ""
 
-#: joanie/core/factories.py:1146 joanie/core/utils/contract_definition.py:102
+#: joanie/core/factories.py:1147 joanie/core/utils/contract_definition.py:102
 msgid "<COURSE_END_DATE>"
 msgstr ""
 
-#: joanie/core/factories.py:1153
+#: joanie/core/factories.py:1154
 msgid "<EFFORT_DURATION>"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgid_plural "%d products to synchronize."
 msgstr[0] ""
 msgstr[1] ""
 
-#: joanie/core/models/accounts.py:34 joanie/core/models/contracts.py:35
+#: joanie/core/models/accounts.py:34 joanie/core/models/contracts.py:36
 msgid "language"
 msgstr ""
 
@@ -453,7 +453,7 @@ msgstr ""
 msgid "owner"
 msgstr ""
 
-#: joanie/core/models/accounts.py:171 joanie/core/models/certifications.py:97
+#: joanie/core/models/accounts.py:171 joanie/core/models/certifications.py:98
 #: joanie/core/models/products.py:409
 msgid "organization"
 msgstr ""
@@ -495,7 +495,7 @@ msgid "level"
 msgstr ""
 
 #: joanie/core/models/activity_logs.py:74
-#: joanie/core/models/certifications.py:108 joanie/core/models/contracts.py:96
+#: joanie/core/models/certifications.py:109 joanie/core/models/contracts.py:103
 #: joanie/payment/models.py:74
 msgid "context"
 msgstr ""
@@ -565,37 +565,37 @@ msgstr ""
 msgid "template to generate pdf"
 msgstr ""
 
-#: joanie/core/models/certifications.py:46
-#: joanie/core/models/certifications.py:70
+#: joanie/core/models/certifications.py:47
+#: joanie/core/models/certifications.py:71
 msgid "Certificate definition"
 msgstr ""
 
-#: joanie/core/models/certifications.py:47
+#: joanie/core/models/certifications.py:48
 msgid "Certificate definitions"
 msgstr ""
 
-#: joanie/core/models/certifications.py:65
+#: joanie/core/models/certifications.py:66
 msgid "Date of issuance"
 msgstr ""
 
-#: joanie/core/models/certifications.py:82 joanie/core/models/contracts.py:86
+#: joanie/core/models/certifications.py:83 joanie/core/models/contracts.py:93
 #: joanie/core/models/products.py:1276 joanie/payment/models.py:54
 msgid "order"
 msgstr ""
 
-#: joanie/core/models/certifications.py:91 joanie/core/models/products.py:431
+#: joanie/core/models/certifications.py:92 joanie/core/models/products.py:431
 msgid "enrollment"
 msgstr ""
 
-#: joanie/core/models/certifications.py:102 joanie/core/models/contracts.py:46
+#: joanie/core/models/certifications.py:103 joanie/core/models/contracts.py:47
 msgid "images"
 msgstr ""
 
-#: joanie/core/models/certifications.py:109
+#: joanie/core/models/certifications.py:110
 msgid "Localized data that needs to be frozen on certificate creation"
 msgstr ""
 
-#: joanie/core/models/certifications.py:117
+#: joanie/core/models/certifications.py:118
 msgid "Certificates"
 msgstr ""
 
@@ -603,52 +603,56 @@ msgstr ""
 msgid "body"
 msgstr ""
 
-#: joanie/core/models/contracts.py:36
+#: joanie/core/models/contracts.py:32
+msgid "appendix"
+msgstr ""
+
+#: joanie/core/models/contracts.py:37
 msgid "Language of the contract definition"
 msgstr ""
 
-#: joanie/core/models/contracts.py:39
+#: joanie/core/models/contracts.py:40
 msgid "template name"
 msgstr ""
 
-#: joanie/core/models/contracts.py:54 joanie/core/models/contracts.py:79
+#: joanie/core/models/contracts.py:55 joanie/core/models/contracts.py:86
 #: joanie/core/models/products.py:105
 msgid "Contract definition"
 msgstr ""
 
-#: joanie/core/models/contracts.py:55
+#: joanie/core/models/contracts.py:56
 msgid "Contract definitions"
 msgstr ""
 
-#: joanie/core/models/contracts.py:98
+#: joanie/core/models/contracts.py:105
 msgid "Localized data snapshot on contract signature"
 msgstr ""
 
-#: joanie/core/models/contracts.py:108
+#: joanie/core/models/contracts.py:115
 msgid "Reference in the external signature backend"
 msgstr ""
 
-#: joanie/core/models/contracts.py:113
+#: joanie/core/models/contracts.py:120
 msgid "Date and time we send the contract to signature provider"
 msgstr ""
 
-#: joanie/core/models/contracts.py:121
+#: joanie/core/models/contracts.py:128
 msgid "Date and time of issuance"
 msgstr ""
 
-#: joanie/core/models/contracts.py:127
+#: joanie/core/models/contracts.py:134
 msgid "organization signatory"
 msgstr ""
 
-#: joanie/core/models/contracts.py:135
+#: joanie/core/models/contracts.py:142
 msgid "Date and time the organization signed the contract"
 msgstr ""
 
-#: joanie/core/models/contracts.py:143
+#: joanie/core/models/contracts.py:150
 msgid "Contract"
 msgstr ""
 
-#: joanie/core/models/contracts.py:144
+#: joanie/core/models/contracts.py:151
 msgid "Contracts"
 msgstr ""
 
@@ -1343,7 +1347,7 @@ msgstr ""
 msgid "Appendices"
 msgstr ""
 
-#: joanie/core/templates/issuers/contract_definition.html:144
+#: joanie/core/templates/issuers/contract_definition.html:147
 #: joanie/core/templates/mail/html/installment_paid.html:259
 #: joanie/core/templates/mail/html/installment_refused.html:235
 #: joanie/core/templates/mail/html/installment_reminder.html:235
@@ -1355,19 +1359,19 @@ msgstr ""
 msgid "Payment schedule"
 msgstr ""
 
-#: joanie/core/templates/issuers/contract_definition.html:148
+#: joanie/core/templates/issuers/contract_definition.html:151
 msgid "Due date"
 msgstr ""
 
-#: joanie/core/templates/issuers/contract_definition.html:149
+#: joanie/core/templates/issuers/contract_definition.html:152
 msgid "Amount"
 msgstr ""
 
-#: joanie/core/templates/issuers/contract_definition.html:155
+#: joanie/core/templates/issuers/contract_definition.html:158
 msgid "Total :"
 msgstr ""
 
-#: joanie/core/templates/issuers/contract_definition.html:173
+#: joanie/core/templates/issuers/contract_definition.html:176
 msgid "Catalog syllabus"
 msgstr ""
 
@@ -1789,14 +1793,18 @@ msgid "<STUDENT_PHONE_NUMBER>"
 msgstr ""
 
 #: joanie/core/utils/contract_definition.py:112
-msgid "<CONTRACT_BODY>"
+msgid "&lt;CONTRACT_BODY&gt;"
 msgstr ""
 
 #: joanie/core/utils/contract_definition.py:113
-msgid "<CONTRACT_TITLE>"
+msgid "&lt;CONTRACT_APPENDIX&gt;"
 msgstr ""
 
 #: joanie/core/utils/contract_definition.py:114
+msgid "<CONTRACT_TITLE>"
+msgstr ""
+
+#: joanie/core/utils/contract_definition.py:115
 msgid "<CONTRACT_DESCRIPTION>"
 msgstr ""
 
diff --git a/src/backend/locale/fr_FR/LC_MESSAGES/django.mo b/src/backend/locale/fr_FR/LC_MESSAGES/django.mo
index 21447a8484320692dc72d852c516e38d00260520..ff42a83779c5e6d99b29fad6f39ae2b4a64cc633 100755
GIT binary patch
delta 9717
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
b1Gx`Icgai3YFN`_<j9PP8F{&zT%P|2sM^Hn

delta 9609
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
E0AQ}7ivR!s

diff --git a/src/backend/locale/fr_FR/LC_MESSAGES/django.po b/src/backend/locale/fr_FR/LC_MESSAGES/django.po
index a15b42b02..4bc17230a 100644
--- a/src/backend/locale/fr_FR/LC_MESSAGES/django.po
+++ b/src/backend/locale/fr_FR/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: joanie\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-16 09:22+0000\n"
-"PO-Revision-Date: 2024-10-16 09:46\n"
+"POT-Creation-Date: 2024-10-22 13:22+0000\n"
+"PO-Revision-Date: 2024-10-22 13:29\n"
 "Last-Translator: \n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
@@ -204,7 +204,7 @@ msgid "Enrollment"
 msgstr "Inscription"
 
 #: joanie/core/enums.py:37 joanie/core/enums.py:150
-#: joanie/core/models/certifications.py:116
+#: joanie/core/models/certifications.py:117
 #: joanie/core/templates/issuers/degree.html:27
 msgid "Certificate"
 msgstr "Certificat"
@@ -328,15 +328,15 @@ msgstr "Payée"
 msgid "Refused"
 msgstr "Refusé"
 
-#: joanie/core/factories.py:1141 joanie/core/utils/contract_definition.py:101
+#: joanie/core/factories.py:1142 joanie/core/utils/contract_definition.py:101
 msgid "<COURSE_START_DATE>"
 msgstr "<DATE_DE_DEBUT_DU_COURS>"
 
-#: joanie/core/factories.py:1146 joanie/core/utils/contract_definition.py:102
+#: joanie/core/factories.py:1147 joanie/core/utils/contract_definition.py:102
 msgid "<COURSE_END_DATE>"
 msgstr "<DATE_DE_FIN_DU_COURS>"
 
-#: joanie/core/factories.py:1153
+#: joanie/core/factories.py:1154
 msgid "<EFFORT_DURATION>"
 msgstr "<EFFORT_DU_COURS>"
 
@@ -392,7 +392,7 @@ msgid_plural "%d products to synchronize."
 msgstr[0] "%d produit à synchroniser."
 msgstr[1] "%d produits à synchroniser."
 
-#: joanie/core/models/accounts.py:34 joanie/core/models/contracts.py:35
+#: joanie/core/models/accounts.py:34 joanie/core/models/contracts.py:36
 msgid "language"
 msgstr "langue"
 
@@ -453,7 +453,7 @@ msgstr "nom de famille"
 msgid "owner"
 msgstr "propriétaire"
 
-#: joanie/core/models/accounts.py:171 joanie/core/models/certifications.py:97
+#: joanie/core/models/accounts.py:171 joanie/core/models/certifications.py:98
 #: joanie/core/models/products.py:409
 msgid "organization"
 msgstr "établissement"
@@ -495,7 +495,7 @@ msgid "level"
 msgstr "niveau"
 
 #: joanie/core/models/activity_logs.py:74
-#: joanie/core/models/certifications.py:108 joanie/core/models/contracts.py:96
+#: joanie/core/models/certifications.py:109 joanie/core/models/contracts.py:103
 #: joanie/payment/models.py:74
 msgid "context"
 msgstr "contexte"
@@ -565,37 +565,37 @@ msgstr "description"
 msgid "template to generate pdf"
 msgstr "modèle pour générer le PDF"
 
-#: joanie/core/models/certifications.py:46
-#: joanie/core/models/certifications.py:70
+#: joanie/core/models/certifications.py:47
+#: joanie/core/models/certifications.py:71
 msgid "Certificate definition"
 msgstr "Définition de certificat"
 
-#: joanie/core/models/certifications.py:47
+#: joanie/core/models/certifications.py:48
 msgid "Certificate definitions"
 msgstr "Définitions de certificat"
 
-#: joanie/core/models/certifications.py:65
+#: joanie/core/models/certifications.py:66
 msgid "Date of issuance"
 msgstr "Date de délivrance"
 
-#: joanie/core/models/certifications.py:82 joanie/core/models/contracts.py:86
+#: joanie/core/models/certifications.py:83 joanie/core/models/contracts.py:93
 #: joanie/core/models/products.py:1276 joanie/payment/models.py:54
 msgid "order"
 msgstr "commande"
 
-#: joanie/core/models/certifications.py:91 joanie/core/models/products.py:431
+#: joanie/core/models/certifications.py:92 joanie/core/models/products.py:431
 msgid "enrollment"
 msgstr "inscription"
 
-#: joanie/core/models/certifications.py:102 joanie/core/models/contracts.py:46
+#: joanie/core/models/certifications.py:103 joanie/core/models/contracts.py:47
 msgid "images"
 msgstr "images"
 
-#: joanie/core/models/certifications.py:109
+#: joanie/core/models/certifications.py:110
 msgid "Localized data that needs to be frozen on certificate creation"
 msgstr "Données traduites qui doivent être gelées lors de la création d'un certificat"
 
-#: joanie/core/models/certifications.py:117
+#: joanie/core/models/certifications.py:118
 msgid "Certificates"
 msgstr "Certificats"
 
@@ -603,52 +603,56 @@ msgstr "Certificats"
 msgid "body"
 msgstr "contenu"
 
-#: joanie/core/models/contracts.py:36
+#: joanie/core/models/contracts.py:32
+msgid "appendix"
+msgstr "annexe"
+
+#: joanie/core/models/contracts.py:37
 msgid "Language of the contract definition"
 msgstr "Langue de la définition de contrat"
 
-#: joanie/core/models/contracts.py:39
+#: joanie/core/models/contracts.py:40
 msgid "template name"
 msgstr "nom du modèle"
 
-#: joanie/core/models/contracts.py:54 joanie/core/models/contracts.py:79
+#: joanie/core/models/contracts.py:55 joanie/core/models/contracts.py:86
 #: joanie/core/models/products.py:105
 msgid "Contract definition"
 msgstr "Définition de contrat"
 
-#: joanie/core/models/contracts.py:55
+#: joanie/core/models/contracts.py:56
 msgid "Contract definitions"
 msgstr "Définitions de contrat"
 
-#: joanie/core/models/contracts.py:98
+#: joanie/core/models/contracts.py:105
 msgid "Localized data snapshot on contract signature"
 msgstr "Instantané des données internationalisées à la signature du contrat"
 
-#: joanie/core/models/contracts.py:108
+#: joanie/core/models/contracts.py:115
 msgid "Reference in the external signature backend"
 msgstr "Référence sur la plateforme de signature externe"
 
-#: joanie/core/models/contracts.py:113
+#: joanie/core/models/contracts.py:120
 msgid "Date and time we send the contract to signature provider"
 msgstr "Date et heure d'envoi du contrat sur la plateforme de signature"
 
-#: joanie/core/models/contracts.py:121
+#: joanie/core/models/contracts.py:128
 msgid "Date and time of issuance"
 msgstr "Date et heure de signature du contrat par l'établissement"
 
-#: joanie/core/models/contracts.py:127
+#: joanie/core/models/contracts.py:134
 msgid "organization signatory"
 msgstr "signataire de l'établissement"
 
-#: joanie/core/models/contracts.py:135
+#: joanie/core/models/contracts.py:142
 msgid "Date and time the organization signed the contract"
 msgstr "Date et heure de signature du contrat par l'établissement"
 
-#: joanie/core/models/contracts.py:143
+#: joanie/core/models/contracts.py:150
 msgid "Contract"
 msgstr "Contrat"
 
-#: joanie/core/models/contracts.py:144
+#: joanie/core/models/contracts.py:151
 msgid "Contracts"
 msgstr "Contrats"
 
@@ -1343,7 +1347,7 @@ msgstr "Signature du représentant de l'université :"
 msgid "Appendices"
 msgstr "Annexes"
 
-#: joanie/core/templates/issuers/contract_definition.html:144
+#: joanie/core/templates/issuers/contract_definition.html:147
 #: joanie/core/templates/mail/html/installment_paid.html:259
 #: joanie/core/templates/mail/html/installment_refused.html:235
 #: joanie/core/templates/mail/html/installment_reminder.html:235
@@ -1355,19 +1359,19 @@ msgstr "Annexes"
 msgid "Payment schedule"
 msgstr "Échéancier"
 
-#: joanie/core/templates/issuers/contract_definition.html:148
+#: joanie/core/templates/issuers/contract_definition.html:151
 msgid "Due date"
 msgstr "Date d’échéance"
 
-#: joanie/core/templates/issuers/contract_definition.html:149
+#: joanie/core/templates/issuers/contract_definition.html:152
 msgid "Amount"
 msgstr "Montant"
 
-#: joanie/core/templates/issuers/contract_definition.html:155
+#: joanie/core/templates/issuers/contract_definition.html:158
 msgid "Total :"
 msgstr "Total :"
 
-#: joanie/core/templates/issuers/contract_definition.html:173
+#: joanie/core/templates/issuers/contract_definition.html:176
 msgid "Catalog syllabus"
 msgstr "Syllabus de la formation"
 
@@ -1793,14 +1797,18 @@ msgid "<STUDENT_PHONE_NUMBER>"
 msgstr "<TELEPHONE_APPRENANT>"
 
 #: joanie/core/utils/contract_definition.py:112
-msgid "<CONTRACT_BODY>"
-msgstr "<CONTENU_DU_CONTRAT>"
+msgid "&lt;CONTRACT_BODY&gt;"
+msgstr "&lt;CORPS_DU_CONTRAT&gt;"
 
 #: joanie/core/utils/contract_definition.py:113
+msgid "&lt;CONTRACT_APPENDIX&gt;"
+msgstr "&lt;ANNEXE_DU_CONTRAT&gt;"
+
+#: joanie/core/utils/contract_definition.py:114
 msgid "<CONTRACT_TITLE>"
 msgstr "<TITRE_DU_CONTRAT>"
 
-#: joanie/core/utils/contract_definition.py:114
+#: joanie/core/utils/contract_definition.py:115
 msgid "<CONTRACT_DESCRIPTION>"
 msgstr "<DESCRIPTION_DU_CONTRAT>"
 
diff --git a/src/backend/pyproject.toml b/src/backend/pyproject.toml
index 14438d107..5cc0ea510 100644
--- a/src/backend/pyproject.toml
+++ b/src/backend/pyproject.toml
@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "joanie"
-version = "2.8.0"
+version = "2.9.0"
 authors = [{ "name" = "Open FUN (France Université Numérique)", "email" = "fun.dev@fun-mooc.fr" }]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
diff --git a/src/frontend/admin/i18n/locales/es-ES.json b/src/frontend/admin/i18n/locales/es-ES.json
index 878e44743..795120638 100644
--- a/src/frontend/admin/i18n/locales/es-ES.json
+++ b/src/frontend/admin/i18n/locales/es-ES.json
@@ -155,6 +155,10 @@
     "description": "Label for the language input",
     "message": "Language"
   },
+  "components.templates.contractDefinitions.form.appendixLabel": {
+    "description": "Label for the appendix input",
+    "message": "Appendix"
+  },
   "components.templates.contractDefinitions.form.bodyLabel": {
     "description": "Label for the body input",
     "message": "Body"
diff --git a/src/frontend/admin/i18n/locales/fr-CA.json b/src/frontend/admin/i18n/locales/fr-CA.json
index 878e44743..795120638 100644
--- a/src/frontend/admin/i18n/locales/fr-CA.json
+++ b/src/frontend/admin/i18n/locales/fr-CA.json
@@ -155,6 +155,10 @@
     "description": "Label for the language input",
     "message": "Language"
   },
+  "components.templates.contractDefinitions.form.appendixLabel": {
+    "description": "Label for the appendix input",
+    "message": "Appendix"
+  },
   "components.templates.contractDefinitions.form.bodyLabel": {
     "description": "Label for the body input",
     "message": "Body"
diff --git a/src/frontend/admin/i18n/locales/fr-FR.json b/src/frontend/admin/i18n/locales/fr-FR.json
index 42bcc6f53..b75e1e22f 100644
--- a/src/frontend/admin/i18n/locales/fr-FR.json
+++ b/src/frontend/admin/i18n/locales/fr-FR.json
@@ -155,6 +155,10 @@
     "description": "Label for the language input",
     "message": "Langue"
   },
+  "components.templates.contractDefinitions.form.appendixLabel": {
+    "description": "Label for the appendix input",
+    "message": "Annexe"
+  },
   "components.templates.contractDefinitions.form.bodyLabel": {
     "description": "Label for the body input",
     "message": "Contenu"
diff --git a/src/frontend/admin/package.json b/src/frontend/admin/package.json
index b9b4e5e5e..6dfda37a1 100644
--- a/src/frontend/admin/package.json
+++ b/src/frontend/admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "admin",
-  "version": "2.8.0",
+  "version": "2.9.0",
   "private": true,
   "scripts": {
     "dev": "next dev -p 8072",
diff --git a/src/frontend/admin/src/translations/es-ES.json b/src/frontend/admin/src/translations/es-ES.json
index eb68b159f..439ee5a8a 100644
--- a/src/frontend/admin/src/translations/es-ES.json
+++ b/src/frontend/admin/src/translations/es-ES.json
@@ -38,6 +38,7 @@
   "components.templates.certificatesDefinitions.modals.CreateOrEditCertificationModal.edit": "Edit the \"{name}\" course",
   "components.templates.contractDefinition.filters.ContractDefinitionFilters.searchPlaceholder": "Search by title",
   "components.templates.contractDefinitions.form.RhfContractDefinitionLanguage.languageLabel": "Language",
+  "components.templates.contractDefinitions.form.appendixLabel": "Appendix",
   "components.templates.contractDefinitions.form.bodyLabel": "Body",
   "components.templates.contractDefinitions.form.descriptionLabel": "Description",
   "components.templates.contractDefinitions.form.informationText": "This is a contract template that will be used to issue contracts.",
diff --git a/src/frontend/admin/src/translations/fr-CA.json b/src/frontend/admin/src/translations/fr-CA.json
index eb68b159f..439ee5a8a 100644
--- a/src/frontend/admin/src/translations/fr-CA.json
+++ b/src/frontend/admin/src/translations/fr-CA.json
@@ -38,6 +38,7 @@
   "components.templates.certificatesDefinitions.modals.CreateOrEditCertificationModal.edit": "Edit the \"{name}\" course",
   "components.templates.contractDefinition.filters.ContractDefinitionFilters.searchPlaceholder": "Search by title",
   "components.templates.contractDefinitions.form.RhfContractDefinitionLanguage.languageLabel": "Language",
+  "components.templates.contractDefinitions.form.appendixLabel": "Appendix",
   "components.templates.contractDefinitions.form.bodyLabel": "Body",
   "components.templates.contractDefinitions.form.descriptionLabel": "Description",
   "components.templates.contractDefinitions.form.informationText": "This is a contract template that will be used to issue contracts.",
diff --git a/src/frontend/admin/src/translations/fr-FR.json b/src/frontend/admin/src/translations/fr-FR.json
index c98f25874..3ba9e82c6 100644
--- a/src/frontend/admin/src/translations/fr-FR.json
+++ b/src/frontend/admin/src/translations/fr-FR.json
@@ -38,6 +38,7 @@
   "components.templates.certificatesDefinitions.modals.CreateOrEditCertificationModal.edit": "Modifier le cours \"{name}\"",
   "components.templates.contractDefinition.filters.ContractDefinitionFilters.searchPlaceholder": "Rechercher par titre",
   "components.templates.contractDefinitions.form.RhfContractDefinitionLanguage.languageLabel": "Langue",
+  "components.templates.contractDefinitions.form.appendixLabel": "Annexe",
   "components.templates.contractDefinitions.form.bodyLabel": "Contenu",
   "components.templates.contractDefinitions.form.descriptionLabel": "Description",
   "components.templates.contractDefinitions.form.informationText": "Il s'agit d'un modèle de contrat qui sera utilisé pour émettre des contrats.",
diff --git a/src/mail/package.json b/src/mail/package.json
index c339273b3..bdd90a16f 100644
--- a/src/mail/package.json
+++ b/src/mail/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mail_mjml",
-  "version": "2.8.0",
+  "version": "2.9.0",
   "description": "An util to generate html and text django's templates from mjml templates",
   "type": "module",
   "dependencies": {
diff --git a/src/openApiClientJs/package.json b/src/openApiClientJs/package.json
index e504bff01..f8d3b74f1 100644
--- a/src/openApiClientJs/package.json
+++ b/src/openApiClientJs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "joanie-openapi-client-ts",
-  "version": "2.8.0",
+  "version": "2.9.0",
   "private": true,
   "description": "Tool to generate Typescript api client for joanie",
   "scripts": {
diff --git a/src/tray/tray.yml b/src/tray/tray.yml
index 07153af83..5c95c750a 100644
--- a/src/tray/tray.yml
+++ b/src/tray/tray.yml
@@ -1,3 +1,3 @@
 metadata:
   name: joanie
-  version: 2.8.0
+  version: 2.9.0
diff --git a/src/tray/vars/all/main.yml b/src/tray/vars/all/main.yml
index c8d4dc261..1f21a9483 100644
--- a/src/tray/vars/all/main.yml
+++ b/src/tray/vars/all/main.yml
@@ -21,7 +21,7 @@ joanie_nginx_static_cache_expires: "1M"
 
 # -- admin nginx
 joanie_admin_nginx_image_name: "fundocker/joanie-admin"
-joanie_admin_nginx_image_tag: "2.8.0"
+joanie_admin_nginx_image_tag: "2.9.0"
 joanie_admin_nginx_port: 8061
 joanie_admin_nginx_replicas: 1
 joanie_admin_nginx_healthcheck_port: 5000
@@ -41,7 +41,7 @@ joanie_database_secret_name: "joanie-postgresql-{{ joanie_vault_checksum | defau
 
 # -- joanie
 joanie_image_name: "fundocker/joanie"
-joanie_image_tag: "2.8.0"
+joanie_image_tag: "2.9.0"
 # The image pull secret name should match the name of your secret created to
 # login to your private docker registry
 joanie_image_pull_secret_name: ""