From 8b3966acae8bd9a9d6aba7f18bba37a53135417e Mon Sep 17 00:00:00 2001
From: Thomas Da Silva <tdasilva@openstudio.fr>
Date: Mon, 19 Oct 2026 15:12:15 +0200
Subject: [PATCH 01/12] feat: give each credit note a language

A credit note gets the language of its order, of its customer without an
order, or the default language of the shop when it is written, and the
back-office modal lets the administrator change it, numbered or not. The
document is printed in that language, still within document_locales. The
update fills the existing credit notes with the language of their customer,
the one they were printed in until now.
---
 CHANGELOG.md                                  |   1 +
 Config/Update/sql/4.3.0.sql                   |  22 +++
 Config/schema.xml                             |  10 ++
 Config/thelia.sql                             |   9 +-
 Controller/CreditNoteController.php           |  41 ++++--
 EventListener/CreditNoteListener.php          |   9 +-
 Form/CreditNoteCreateForm.php                 |   3 +
 I18n/backOffice/default/en_US.php             |   2 +
 I18n/backOffice/default/fr_FR.php             |   2 +
 Service/CreditNoteDocumentLocale.php          |  19 +--
 Service/CreditNoteLanguage.php                |  54 +++++++
 Service/CreditNoteModalPresenter.php          |  17 +++
 .../ajax/credit-note-modal.html.twig          |  13 ++
 .../CreditNoteDocumentLocaleTest.php          |  70 ++++++---
 .../CreditNoteLanguageRouteTest.php           | 133 +++++++++++++++++
 tests/Integration/CreditNoteLanguageTest.php  | 136 ++++++++++++++++++
 16 files changed, 502 insertions(+), 39 deletions(-)
 create mode 100644 Config/Update/sql/4.3.0.sql
 create mode 100644 Service/CreditNoteLanguage.php
 create mode 100644 tests/Integration/CreditNoteLanguageRouteTest.php
 create mode 100644 tests/Integration/CreditNoteLanguageTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72f4683..a4d4b72 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- A credit note has a language (`lang_id`), chosen in the back-office modal: the language of its order by default, of its customer without an order, the default language of the shop otherwise. It stays editable once the credit note is numbered, since it only changes the printed document. The document is printed in it (still within `document_locales`). The update fills the existing credit notes with the language they were printed in: the one of their customer, of their order when the customer has none.
 - Smarty is gone, as in Thelia 3: the Smarty plugin `credit_note_format_address`, the Smarty back-office and PDF templates, the Smarty fallback of the back-office hooks. The loops no Twig template calls are removed too: `credit-note-comment`, `credit-note-status`, `credit-note-type`, `order-credit-note` and `credit-note-version` (its table has not existed since 2.3.4). The loops `credit-note`, `credit-note-address` and `credit-note-detail` stay: the credit note document of the PDF template reads them.
 - The languages a credit note is printed in are a setting of the module (`document_locales`, locales separated by commas): a customer whose language is in the list gets the document in that language, the others the default language of the shop. Empty, as before: English and French. A shop whose PDF template is translated in German adds `de_DE`. The field refuses anything that is not a list of locales such as `fr_FR`.
 - Credit notes numbered like the invoices (`invoice_ref_with_thelia_order`) draw their number from `InvoiceRefSequence::next()` (InvoiceRef 3.1 or later): the counter is read under a lock shared with the orders, and a number an order already carries is skipped. The previous read and increment, without a lock, could hand the same number to an invoice and a credit note.
diff --git a/Config/Update/sql/4.3.0.sql b/Config/Update/sql/4.3.0.sql
new file mode 100644
index 0000000..7632076
--- /dev/null
+++ b/Config/Update/sql/4.3.0.sql
@@ -0,0 +1,22 @@
+# This is a fix for InnoDB in MySQL >= 4.1.x
+# It "suspends judgement" for fkey relationships until are tables are set.
+SET FOREIGN_KEY_CHECKS = 0;
+
+ALTER TABLE `credit_note` ADD `lang_id` INTEGER AFTER `allow_partial_use`;
+ALTER TABLE `credit_note` ADD INDEX `idx_lang_id_fk` (`lang_id`);
+ALTER TABLE `credit_note` ADD CONSTRAINT `credit_note_FK_8`
+    FOREIGN KEY (`lang_id`)
+    REFERENCES `lang` (`id`)
+    ON UPDATE RESTRICT
+    ON DELETE SET NULL;
+
+# The existing credit notes keep the language they were printed in until now: the one of their
+# customer, or of their order when the customer has none.
+UPDATE `credit_note`
+    LEFT JOIN `customer` ON `customer`.`id` = `credit_note`.`customer_id`
+    LEFT JOIN `order` ON `order`.`id` = `credit_note`.`order_id`
+SET `credit_note`.`lang_id` = COALESCE(`customer`.`lang_id`, `order`.`lang_id`)
+WHERE `credit_note`.`lang_id` IS NULL;
+
+# This restores the fkey checks, after having unset them earlier
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/Config/schema.xml b/Config/schema.xml
index 26aaa27..dd9df59 100755
--- a/Config/schema.xml
+++ b/Config/schema.xml
@@ -28,6 +28,8 @@
 
         <column name="allow_partial_use" type="BOOLEAN" defaultValue="1" />
 
+        <column name="lang_id" type="INTEGER" required="false" />
+
         <foreign-key foreignTable="order" onDelete="RESTRICT" onUpdate="RESTRICT">
             <reference local="order_id" foreign="id" />
         </foreign-key>
@@ -56,6 +58,10 @@
             <reference local="invoice_address_id" foreign="id" />
         </foreign-key>
 
+        <foreign-key foreignTable="lang" onDelete="SET NULL" onUpdate="RESTRICT">
+            <reference local="lang_id" foreign="id" />
+        </foreign-key>
+
         <unique name="ref_UNIQUE">
             <unique-column name="ref" />
         </unique>
@@ -84,6 +90,10 @@
             <index-column name="status_id" />
         </index>
 
+        <index name="idx_lang_id_fk">
+            <index-column name="lang_id" />
+        </index>
+
         <behavior name="timestampable" />
     </table>
 
diff --git a/Config/thelia.sql b/Config/thelia.sql
index 85b9085..43553e4 100755
--- a/Config/thelia.sql
+++ b/Config/thelia.sql
@@ -28,6 +28,7 @@ CREATE TABLE `credit_note`
     `discount_without_tax` DECIMAL(16,6) DEFAULT 0.000000,
     `discount_with_tax` DECIMAL(16,6) DEFAULT 0.000000,
     `allow_partial_use` TINYINT(1) DEFAULT 1,
+    `lang_id` INTEGER,
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`),
@@ -38,6 +39,7 @@ CREATE TABLE `credit_note`
     INDEX `idx_parent_id_fk` (`parent_id`),
     INDEX `idx_type_id_fk` (`type_id`),
     INDEX `idx_status_id_fk` (`status_id`),
+    INDEX `idx_lang_id_fk` (`lang_id`),
     INDEX `credit_note_FI_6` (`currency_id`),
     INDEX `credit_note_FI_7` (`invoice_address_id`),
     CONSTRAINT `credit_note_FK_1`
@@ -74,7 +76,12 @@ CREATE TABLE `credit_note`
         FOREIGN KEY (`invoice_address_id`)
         REFERENCES `credit_note_address` (`id`)
         ON UPDATE RESTRICT
-        ON DELETE RESTRICT
+        ON DELETE RESTRICT,
+    CONSTRAINT `credit_note_FK_8`
+        FOREIGN KEY (`lang_id`)
+        REFERENCES `lang` (`id`)
+        ON UPDATE RESTRICT
+        ON DELETE SET NULL
 ) ENGINE=InnoDB;
 
 -- ---------------------------------------------------------------------
diff --git a/Controller/CreditNoteController.php b/Controller/CreditNoteController.php
index cffec20..f822b39 100755
--- a/Controller/CreditNoteController.php
+++ b/Controller/CreditNoteController.php
@@ -13,6 +13,7 @@
 use CreditNote\Helper\CreditNoteHelper;
 use CreditNote\Helper\CriteriaSearchHelper;
 use CreditNote\Service\CreditNoteHookPresenter;
+use CreditNote\Service\CreditNoteLanguage;
 use CreditNote\Service\CreditNoteModalPresenter;
 use CreditNote\Service\CreditNotePdfRenderer;
 use CreditNote\Exception\CreditNoteExceedsOrderException;
@@ -157,9 +158,9 @@ public function saveConfigAction(Request $request)
     }
 
     #[Route('/credit-note/create', name: '_create', methods: 'POST')]
-    public function createAction(Request $request, EventDispatcherInterface $eventDispatcher, ParserContext $parserContext, SecurityContext $securityContext)
+    public function createAction(Request $request, EventDispatcherInterface $eventDispatcher, ParserContext $parserContext, SecurityContext $securityContext, CreditNoteLanguage $language)
     {
-        $creditNote = $this->performCreditNote($eventDispatcher, $parserContext, $securityContext);
+        $creditNote = $this->performCreditNote($eventDispatcher, $parserContext, $securityContext, $language);
 
         $con = Propel::getServiceContainer()->getWriteConnection(CreditNoteTableMap::DATABASE_NAME);
 
@@ -207,13 +208,13 @@ public function createAction(Request $request, EventDispatcherInterface $eventDi
      * @return \Thelia\Core\HttpFoundation\Response
      */
     #[Route('/credit-note/{id}', name: '_view', methods: 'POST', requirements: ['id' => '\d+'])]
-    public function viewAction(Request $request, $id, EventDispatcherInterface $eventDispatcher, ParserContext $parserContext, SecurityContext $securityContext, CreditNoteModalPresenter $modalPresenter)
+    public function viewAction(Request $request, $id, EventDispatcherInterface $eventDispatcher, ParserContext $parserContext, SecurityContext $securityContext, CreditNoteModalPresenter $modalPresenter, CreditNoteLanguage $language)
     {
         $creditNote = CreditNoteQuery::create()
             ->filterById($id, Criteria::EQUAL)
             ->findOne();
 
-        $creditNote = $this->performCreditNote($eventDispatcher, $parserContext, $securityContext, $creditNote);
+        $creditNote = $this->performCreditNote($eventDispatcher, $parserContext, $securityContext, $language, $creditNote);
 
         return $this->renderModal($request, $creditNote, $modalPresenter);
     }
@@ -230,13 +231,13 @@ private function renderModal(Request $request, CreditNote $creditNote, CreditNot
     }
 
     #[Route('/credit-note/{id}/_update', name: '_update', methods: 'POST', requirements: ['id' => '\d+'])]
-    public function updateAction(Request $request, $id, EventDispatcherInterface $eventDispatcher, ParserContext $parserContext, SecurityContext $securityContext)
+    public function updateAction(Request $request, $id, EventDispatcherInterface $eventDispatcher, ParserContext $parserContext, SecurityContext $securityContext, CreditNoteLanguage $language)
     {
         $creditNote = CreditNoteQuery::create()
             ->filterById($id, Criteria::EQUAL)
             ->findOne();
 
-        $creditNote = $this->performCreditNote($eventDispatcher, $parserContext, $securityContext, $creditNote);
+        $creditNote = $this->performCreditNote($eventDispatcher, $parserContext, $securityContext, $language, $creditNote);
 
         $con = Propel::getServiceContainer()->getWriteConnection(CreditNoteTableMap::DATABASE_NAME);
 
@@ -322,9 +323,9 @@ public function deleteAction(Request $request, $id, Translator $translator)
      * @return \Thelia\Core\HttpFoundation\Response
      */
     #[Route('/credit-note/ajax/modal/create', name: '_ajax_create', methods: 'POST')]
-    public function ajaxModalCreateAction(Request $request, EventDispatcherInterface $eventDispatcher, ParserContext $parserContext, SecurityContext $securityContext, CreditNoteModalPresenter $modalPresenter)
+    public function ajaxModalCreateAction(Request $request, EventDispatcherInterface $eventDispatcher, ParserContext $parserContext, SecurityContext $securityContext, CreditNoteModalPresenter $modalPresenter, CreditNoteLanguage $language)
     {
-        $creditNote = $this->performCreditNote($eventDispatcher, $parserContext, $securityContext);
+        $creditNote = $this->performCreditNote($eventDispatcher, $parserContext, $securityContext, $language);
 
         return $this->renderModal($request, $creditNote, $modalPresenter);
     }
@@ -391,7 +392,7 @@ private function exceedsOrderMessage(CreditNoteExceedsOrderException $exception)
     /**
      * @return CreditNote
      */
-    protected function performCreditNote(EventDispatcherInterface $eventDispatcher, ParserContext $parserContext, SecurityContext $securityContext, CreditNote $creditNote = null)
+    protected function performCreditNote(EventDispatcherInterface $eventDispatcher, ParserContext $parserContext, SecurityContext $securityContext, CreditNoteLanguage $language, ?CreditNote $creditNote = null)
     {
         if (null === $creditNote) {
             $creditNote = new CreditNote();
@@ -416,7 +417,11 @@ protected function performCreditNote(EventDispatcherInterface $eventDispatcher,
             ;
         }
 
-        $this->performComment($formValidate, $creditNote, $securityContext);
+        // The language only changes the printed document: it stays editable once the credit
+        // note is numbered, like the comment.
+        $this
+            ->performLang($formValidate, $creditNote, $language)
+            ->performComment($formValidate, $creditNote, $securityContext);
 
         $parserContext->addForm($form);
 
@@ -561,6 +566,22 @@ protected function performAmount(Form $formValidate, CreditNote $creditNote)
         return $this;
     }
 
+    /**
+     * A language the credit note cannot have (unknown, or inactive and not already its own) is
+     * ignored: the credit note keeps its language. None chosen yet on a new credit note: the
+     * default one is set on insert (CreditNoteListener).
+     */
+    protected function performLang(Form $formValidate, CreditNote $creditNote, CreditNoteLanguage $language)
+    {
+        $langId = (int) $formValidate->get('lang_id')->getData();
+
+        if ($langId > 0 && $language->isSelectable($creditNote, $langId)) {
+            $creditNote->setLangId($langId);
+        }
+
+        return $this;
+    }
+
     protected function performComment(Form $formValidate, CreditNote $creditNote, SecurityContext $securityContext)
     {
         /** @var string $orderId */
diff --git a/EventListener/CreditNoteListener.php b/EventListener/CreditNoteListener.php
index 3f1353d..6fbd6d1 100755
--- a/EventListener/CreditNoteListener.php
+++ b/EventListener/CreditNoteListener.php
@@ -13,6 +13,7 @@
 use CreditNote\Event\PropelEvent;
 use CreditNote\Model\CreditNote as CreditNoteModel;
 use CreditNote\Model\Map\CreditNoteTableMap;
+use CreditNote\Service\CreditNoteLanguage;
 use CreditNote\Service\CreditNoteOrderCeiling;
 use CreditNote\Service\SharedInvoiceNumber;
 use Propel\Runtime\Propel;
@@ -26,6 +27,7 @@ class CreditNoteListener implements EventSubscriberInterface
     public function __construct(
         private readonly CreditNoteOrderCeiling $orderCeiling,
         private readonly SharedInvoiceNumber $sharedInvoiceNumber,
+        private readonly CreditNoteLanguage $language,
     ) {
     }
 
@@ -44,7 +46,8 @@ public function generateCreditNoteInvoiceRef(PropelEvent $event)
 
     /**
      * Before an insert: the ceiling of the order, then the reference, then the accounting
-     * number when the credit note is created accepted.
+     * number when the credit note is created accepted. A credit note written without a
+     * language gets the default one (see CreditNoteLanguage).
      */
     public function generateCreditNoteRef(PropelEvent $event)
     {
@@ -53,6 +56,10 @@ public function generateCreditNoteRef(PropelEvent $event)
 
         $this->enforceOrderCeiling($instance);
 
+        if ($instance->getLangId() === null) {
+            $instance->setLangId($this->language->defaultFor($instance)?->getId());
+        }
+
         if ($instance->getRef() === null) {
             $ref = CreditNote::getConfigValue(CreditNote::CONFIG_KEY_REF_PREFIX) . str_pad(
                 (int) CreditNote::getConfigValue(CreditNote::CONFIG_KEY_REF_INCREMENT, 1) + 1,
diff --git a/Form/CreditNoteCreateForm.php b/Form/CreditNoteCreateForm.php
index 6f503c3..7a3da97 100755
--- a/Form/CreditNoteCreateForm.php
+++ b/Form/CreditNoteCreateForm.php
@@ -63,6 +63,9 @@ protected function buildForm()
             ))
             ->add('comment', TextType::class, array(
                 'required' => false
+            ))
+            ->add('lang_id', IntegerType::class, array(
+                'required' => false
             ));
 
         $this->formBuilder
diff --git a/I18n/backOffice/default/en_US.php b/I18n/backOffice/default/en_US.php
index d1bb828..09c9147 100755
--- a/I18n/backOffice/default/en_US.php
+++ b/I18n/backOffice/default/en_US.php
@@ -41,6 +41,7 @@
     'Credit Notes' => 'Credit notes',
     'Customer' => 'Customer',
     'Customer :' => 'Customer:',
+    'Default (%language)' => 'Default (%language)',
     'Delete' => 'Delete',
     'Delete credit note' => 'Delete the credit note',
     'Discount' => 'Discount',
@@ -57,6 +58,7 @@
     'Invoice date' => 'Invoice date',
     'Invoice ref' => 'Invoice ref',
     'Invoice ref :' => 'Invoice ref:',
+    'Language :' => 'Language:',
     'Lastname :' => 'Last name:',
     'Message content : ' => 'Message:',
     'Message sent to the customer when a credit note is created from an order.' => 'Message sent to the customer when a credit note is created from an order.',
diff --git a/I18n/backOffice/default/fr_FR.php b/I18n/backOffice/default/fr_FR.php
index fb15ac2..c9e3097 100755
--- a/I18n/backOffice/default/fr_FR.php
+++ b/I18n/backOffice/default/fr_FR.php
@@ -49,6 +49,7 @@
     'Customer' => 'Client',
     'Customer :' => 'Client :',
     'Customer : ' => 'Client :',
+    'Default (%language)' => 'Par défaut (%language)',
     'Delete' => 'Supprimer',
     'Delete credit note' => 'Supprimer cet avoir',
     'Discount' => 'Réduction',
@@ -71,6 +72,7 @@
     'Invoice ref' => 'Référence facture',
     'Invoice ref :' => 'Référence facture :',
     'Invoice ref : <strong>%ref</strong>' => 'Référence facture : <strong>%ref</strong>',
+    'Language :' => 'Langue :',
     'Lastname :' => 'Nom :',
     'Lastname : ' => 'Nom :',
     'Message content : ' => 'Message :',
diff --git a/Service/CreditNoteDocumentLocale.php b/Service/CreditNoteDocumentLocale.php
index d639ae6..180bab4 100644
--- a/Service/CreditNoteDocumentLocale.php
+++ b/Service/CreditNoteDocumentLocale.php
@@ -10,10 +10,11 @@
 use Thelia\Model\LangQuery;
 
 /**
- * The language a credit note is printed in: the one its customer prefers when the shop prints
- * its credit notes in that language (`document_locales` setting of the module, English and
- * French by default), otherwise the default language of the shop, and English when the shop
- * has none.
+ * The language a credit note is printed in: its own language (chosen in the back-office, see
+ * CreditNoteLanguage), or the one its customer prefers for a credit note without one, when the
+ * shop prints its credit notes in that language (`document_locales` setting of the module,
+ * English and French by default); otherwise the default language of the shop, and English
+ * when the shop has none.
  */
 final readonly class CreditNoteDocumentLocale
 {
@@ -24,10 +25,10 @@
 
     public function forCreditNote(CreditNoteModel $creditNote): string
     {
-        $customerLocale = $this->customerLocale($creditNote);
+        $requestedLocale = $this->requestedLocale($creditNote);
 
-        if (null !== $customerLocale && \in_array($customerLocale, CreditNote::documentLocales(), true)) {
-            return $customerLocale;
+        if (null !== $requestedLocale && \in_array($requestedLocale, CreditNote::documentLocales(), true)) {
+            return $requestedLocale;
         }
 
         $defaultLocale = $this->defaultLocale();
@@ -35,9 +36,9 @@ public function forCreditNote(CreditNoteModel $creditNote): string
         return null !== $defaultLocale && '' !== $defaultLocale ? $defaultLocale : self::FALLBACK;
     }
 
-    private function customerLocale(CreditNoteModel $creditNote): ?string
+    private function requestedLocale(CreditNoteModel $creditNote): ?string
     {
-        $langId = $creditNote->getCustomer()?->getLangId();
+        $langId = $creditNote->getLangId() ?? $creditNote->getCustomer()?->getLangId();
 
         if (null === $langId) {
             return null;
diff --git a/Service/CreditNoteLanguage.php b/Service/CreditNoteLanguage.php
new file mode 100644
index 0000000..7e42dd6
--- /dev/null
+++ b/Service/CreditNoteLanguage.php
@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CreditNote\Service;
+
+use CreditNote\Model\CreditNote as CreditNoteModel;
+use Thelia\Model\Lang;
+use Thelia\Model\LangQuery;
+
+/**
+ * The language of a credit note, chosen in the back-office: the language of its order by
+ * default, of its customer when it has no order, and the default language of the shop
+ * otherwise. Any active language can be chosen; the language a credit note already has stays
+ * selectable even once inactive, so saving it again never changes it.
+ */
+final readonly class CreditNoteLanguage
+{
+    public function defaultFor(CreditNoteModel $creditNote): ?Lang
+    {
+        $langId = $creditNote->getOrder()?->getLangId() ?? $creditNote->getCustomer()?->getLangId();
+
+        if (null !== $langId && null !== $lang = LangQuery::create()->findPk($langId)) {
+            return $lang;
+        }
+
+        return LangQuery::create()->findOneByByDefault(true);
+    }
+
+    /**
+     * @return list<Lang>
+     */
+    public function selectable(CreditNoteModel $creditNote): array
+    {
+        $query = LangQuery::create()->filterByActive(true);
+
+        if (null !== $creditNote->getLangId()) {
+            $query->_or()->filterById($creditNote->getLangId());
+        }
+
+        return iterator_to_array($query->orderByPosition()->find(), false);
+    }
+
+    public function isSelectable(CreditNoteModel $creditNote, int $langId): bool
+    {
+        foreach ($this->selectable($creditNote) as $lang) {
+            if ($lang->getId() === $langId) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/Service/CreditNoteModalPresenter.php b/Service/CreditNoteModalPresenter.php
index 84c952e..f17624d 100644
--- a/Service/CreditNoteModalPresenter.php
+++ b/Service/CreditNoteModalPresenter.php
@@ -32,6 +32,7 @@ final class CreditNoteModalPresenter
 {
     public function __construct(
         private readonly RequestStack $requestStack,
+        private readonly CreditNoteLanguage $language,
     ) {
     }
 
@@ -67,7 +68,10 @@ public function build(CreditNote $creditNote, string $locale): array
                 'total_price_with_tax' => $this->money($creditNote->getTotalPriceWithTax(), $currencyId),
                 'address' => $this->address($creditNote),
                 'comment' => '',
+                'lang_id' => $creditNote->getLangId(),
             ],
+            'languages' => $this->languages($creditNote),
+            'default_language' => $creditNote->getLangId() === null ? $this->language->defaultFor($creditNote)?->getTitle() : null,
             'currencies' => $this->currencies(),
             'statuses' => $this->statuses($locale),
             'types' => $this->types($locale),
@@ -139,6 +143,19 @@ private function statuses(string $locale): array
         return $out;
     }
 
+    /**
+     * @return list<array{id:int,title:string}>
+     */
+    private function languages(CreditNote $creditNote): array
+    {
+        $out = [];
+        foreach ($this->language->selectable($creditNote) as $lang) {
+            $out[] = ['id' => $lang->getId(), 'title' => (string) $lang->getTitle()];
+        }
+
+        return $out;
+    }
+
     /**
      * @return array<int, array{id:int,title:string,color:string}>
      */
diff --git a/templates/backOffice/default-twig/ajax/credit-note-modal.html.twig b/templates/backOffice/default-twig/ajax/credit-note-modal.html.twig
index 2b70623..06c41bc 100644
--- a/templates/backOffice/default-twig/ajax/credit-note-modal.html.twig
+++ b/templates/backOffice/default-twig/ajax/credit-note-modal.html.twig
@@ -53,6 +53,19 @@
         </select>
       </div>
 
+      {# Editable even once the credit note is numbered: the language only changes the printed document. #}
+      <div class="mb-3">
+        <label class="form-label">{{ 'Language :'|trans({}, 'creditnote.bo.default') }}</label>
+        <select class="form-select" name="credit_note_create[lang_id]">
+          {% if cn.lang_id is null %}
+            <option value="" selected>{{ 'Default (%language)'|trans({'%language': modal.default_language|default('')}, 'creditnote.bo.default') }}</option>
+          {% endif %}
+          {% for language in modal.languages %}
+            <option value="{{ language.id }}" {{ cn.lang_id == language.id ? 'selected' : '' }}>{{ language.title }}</option>
+          {% endfor %}
+        </select>
+      </div>
+
       <div class="mb-3">
         <label class="form-label">{{ 'Customer :'|trans({}, 'creditnote.bo.default') }}</label>
         <select class="form-select js-select-customer" name="credit_note_create[customer_id]"
diff --git a/tests/Integration/CreditNoteDocumentLocaleTest.php b/tests/Integration/CreditNoteDocumentLocaleTest.php
index 294292f..ec8a7b0 100644
--- a/tests/Integration/CreditNoteDocumentLocaleTest.php
+++ b/tests/Integration/CreditNoteDocumentLocaleTest.php
@@ -16,9 +16,10 @@
 use Thelia\Test\IntegrationTestCase;
 
 /**
- * The language a credit note is printed in follows its customer: a language the shop prints its
- * credit notes in (French or English unless the `document_locales` setting says otherwise) when
- * that is what the customer prefers, the default language of the shop otherwise.
+ * The language a credit note is printed in is its own, or the one its customer prefers for a
+ * credit note written before credit notes had a language: a language the shop prints its credit
+ * notes in (French or English unless the `document_locales` setting says otherwise), the
+ * default language of the shop otherwise.
  */
 final class CreditNoteDocumentLocaleTest extends IntegrationTestCase
 {
@@ -33,6 +34,10 @@ protected function setUp(): void
         }
 
         $this->fixture = new CreditNoteFixture($this->getPropelConnection());
+
+        // The setting as a shop leaves it until it maintains its own list (English and French).
+        // Inside the test transaction: rolled back with the rest.
+        CreditNote::setConfigValue(CreditNote::CONFIG_KEY_DOCUMENT_LOCALES, '');
     }
 
     #[Test]
@@ -40,8 +45,7 @@ public function aCustomerWhoPrefersFrenchOrEnglishIsServedInThatLanguage(): void
     {
         $customer = $this->fixture->customer();
         $order = $this->fixture->paidOrder($customer);
-        $creditNote = $this->fixture->creditNote($customer, $order, 'accepted');
-        $creditNote->save();
+        $creditNote = $this->withoutLanguage($this->fixture->creditNote($customer, $order, 'accepted'));
 
         $customer->setLangId($this->lang('fr_FR')->getId())->save($this->getPropelConnection());
         self::assertSame('fr_FR', $this->locale()->forCreditNote($this->reload($creditNote)));
@@ -54,8 +58,7 @@ public function aCustomerWhoPrefersFrenchOrEnglishIsServedInThatLanguage(): void
     public function anotherPreferredLanguageFallsBackToTheDefaultLanguageOfTheShop(): void
     {
         $customer = $this->fixture->customer();
-        $creditNote = $this->fixture->creditNote($customer, $this->fixture->paidOrder($customer), 'accepted');
-        $creditNote->save();
+        $creditNote = $this->withoutLanguage($this->fixture->creditNote($customer, $this->fixture->paidOrder($customer), 'accepted'));
 
         $other = $this->fixture->factory()->lang(['locale' => 'de_DE', 'code' => 'de', 'title' => 'Deutsch']);
         $customer->setLangId($other->getId())->save($this->getPropelConnection());
@@ -69,8 +72,7 @@ public function anotherPreferredLanguageFallsBackToTheDefaultLanguageOfTheShop()
     public function aLanguageTheShopPrintsItsCreditNotesInIsServed(): void
     {
         $customer = $this->fixture->customer();
-        $creditNote = $this->fixture->creditNote($customer, $this->fixture->paidOrder($customer), 'accepted');
-        $creditNote->save();
+        $creditNote = $this->withoutLanguage($this->fixture->creditNote($customer, $this->fixture->paidOrder($customer), 'accepted'));
 
         $german = LangQuery::create()->findOneByLocale('de_DE')
             ?? $this->fixture->factory()->lang(['locale' => 'de_DE', 'code' => 'de', 'title' => 'Deutsch']);
@@ -95,8 +97,7 @@ public function aLanguageTheShopPrintsItsCreditNotesInIsServed(): void
     public function aShopWithoutDefaultLanguageFallsBackToEnglish(): void
     {
         $customer = $this->fixture->customer();
-        $creditNote = $this->fixture->creditNote($customer, $this->fixture->paidOrder($customer), 'accepted');
-        $creditNote->save();
+        $creditNote = $this->withoutLanguage($this->fixture->creditNote($customer, $this->fixture->paidOrder($customer), 'accepted'));
 
         $other = $this->fixture->factory()->lang(['locale' => 'de_DE', 'code' => 'de', 'title' => 'Deutsch']);
         $customer->setLangId($other->getId())->save($this->getPropelConnection());
@@ -108,23 +109,44 @@ public function aShopWithoutDefaultLanguageFallsBackToEnglish(): void
     }
 
     #[Test]
-    public function theDocumentIsRenderedInTheLanguageOfTheCustomerWhateverTheOrder(): void
+    public function theLanguageOfTheCreditNoteWinsOverTheOneOfItsCustomer(): void
     {
-        $pdfTemplate = new TemplateDefinition(ConfigQuery::read(TemplateDefinition::PDF_CONFIG_NAME, 'default'), TemplateDefinition::PDF);
+        $customer = $this->fixture->customer();
+        $customer->setLangId($this->lang('en_US')->getId())->save($this->getPropelConnection());
+        $creditNote = $this->fixture->creditNote($customer, $this->fixture->paidOrder($customer), 'accepted')
+            ->setLangId($this->lang('fr_FR')->getId());
+        $creditNote->save();
+
+        self::assertSame('fr_FR', $this->locale()->forCreditNote($this->reload($creditNote)));
+    }
+
+    #[Test]
+    public function theDocumentIsRenderedInTheLanguageOfTheCreditNoteWhateverTheOrderAndTheCustomer(): void
+    {
+        // The wording checked below is the one of the default PDF template, whichever the shop uses.
+        $pdfTemplate = new TemplateDefinition('default', TemplateDefinition::PDF);
 
         if (!is_file($pdfTemplate->getAbsolutePath() . '/credit-note.html.twig')) {
-            self::markTestSkipped(\sprintf('The active PDF template (%s) ships no credit note document.', $pdfTemplate->getName()));
+            self::markTestSkipped('The default PDF template ships no credit note document.');
         }
 
+        $activePdfTemplate = ConfigQuery::read(TemplateDefinition::PDF_CONFIG_NAME, 'default');
+        ConfigQuery::write(TemplateDefinition::PDF_CONFIG_NAME, 'default');
+
+        // Customer and order in English, the credit note chosen in French.
         $customer = $this->fixture->customer();
-        $customer->setLangId($this->lang('fr_FR')->getId())->save($this->getPropelConnection());
-        // The order was placed in English.
+        $customer->setLangId($this->lang('en_US')->getId())->save($this->getPropelConnection());
         $order = $this->fixture->paidOrder($customer);
         $order->setLangId($this->lang('en_US')->getId())->save($this->getPropelConnection());
-        $creditNote = $this->fixture->creditNote($customer, $order, 'accepted');
+        $creditNote = $this->fixture->creditNote($customer, $order, 'accepted')->setLangId($this->lang('fr_FR')->getId());
         $creditNote->save();
 
-        $html = $this->getService(CreditNotePdfRenderer::class)->renderHtml($this->reload($creditNote));
+        try {
+            $html = $this->getService(CreditNotePdfRenderer::class)->renderHtml($this->reload($creditNote));
+        } finally {
+            // The configuration is cached for the whole process: put the shop's value back.
+            ConfigQuery::write(TemplateDefinition::PDF_CONFIG_NAME, $activePdfTemplate);
+        }
 
         self::assertStringContainsString('AVOIR', $html);
         self::assertStringContainsString('Retour produit', $html, 'the type is named in the language of the document');
@@ -142,6 +164,18 @@ private function lang(string $locale): \Thelia\Model\Lang
             ?? self::markTestSkipped(\sprintf('The %s language is not in the test database.', $locale));
     }
 
+    /**
+     * Saved, then stripped of the language it got on insert: a credit note written before
+     * credit notes had a language.
+     */
+    private function withoutLanguage(\CreditNote\Model\CreditNote $creditNote): \CreditNote\Model\CreditNote
+    {
+        $creditNote->save();
+        $creditNote->setLangId(null)->save();
+
+        return $creditNote;
+    }
+
     private function reload(\CreditNote\Model\CreditNote $creditNote): \CreditNote\Model\CreditNote
     {
         // The customer was changed through another object: read the credit note again so its
diff --git a/tests/Integration/CreditNoteLanguageRouteTest.php b/tests/Integration/CreditNoteLanguageRouteTest.php
new file mode 100644
index 0000000..ae114ef
--- /dev/null
+++ b/tests/Integration/CreditNoteLanguageRouteTest.php
@@ -0,0 +1,133 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CreditNote\Tests\Integration;
+
+use CreditNote\CreditNote;
+use CreditNote\Model\CreditNote as CreditNoteModel;
+use CreditNote\Model\CreditNoteQuery;
+use CreditNote\Tests\Support\AdminSessionInjector;
+use CreditNote\Tests\Support\CreditNoteFixture;
+use PHPUnit\Framework\Attributes\Test;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Thelia\Model\Lang;
+use Thelia\Model\LangQuery;
+use Thelia\Model\ModuleQuery;
+use Thelia\Test\FixtureFactory;
+use Thelia\Test\WebIntegrationTestCase;
+
+/**
+ * The language of a credit note is chosen in the back-office modal and stays editable once the
+ * credit note is numbered: it only changes the printed document, never the number nor the
+ * amounts. A language the credit note cannot have is ignored.
+ */
+final class CreditNoteLanguageRouteTest extends WebIntegrationTestCase
+{
+    private CreditNoteFixture $fixture;
+
+    private AdminSessionInjector $injector;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        if (!ModuleQuery::create()->findOneByCode(CreditNote::getModuleCode())?->getActivate()) {
+            self::markTestSkipped('The CreditNote module is not active in the test database.');
+        }
+
+        $this->fixture = new CreditNoteFixture($this->getPropelConnection());
+        $this->injector = new AdminSessionInjector();
+        $this->getService(EventDispatcherInterface::class)->addSubscriber($this->injector);
+    }
+
+    protected function tearDown(): void
+    {
+        if (isset($this->injector)) {
+            $this->injector->clear();
+        }
+
+        parent::tearDown();
+    }
+
+    #[Test]
+    public function theLanguageOfANumberedCreditNoteCanBeChanged(): void
+    {
+        $creditNote = $this->numberedCreditNote();
+        $german = $this->activeLang('de_DE', 'de', 'Deutsch');
+        $this->loginAdmin();
+
+        $this->update($creditNote, $german->getId());
+
+        $saved = CreditNoteQuery::create()->findPk($creditNote->getId());
+        self::assertSame($german->getId(), $saved->getLangId());
+        self::assertSame($creditNote->getRef(), $saved->getRef());
+        self::assertSame($creditNote->getInvoiceRef(), $saved->getInvoiceRef());
+        self::assertSame($creditNote->getTotalPriceWithTax(), $saved->getTotalPriceWithTax());
+        self::assertSame(1, $saved->getCreditNoteDetails()->count());
+    }
+
+    #[Test]
+    public function aLanguageTheCreditNoteCannotHaveIsIgnored(): void
+    {
+        $creditNote = $this->numberedCreditNote();
+        $before = $creditNote->getLangId();
+        self::assertNotNull($before, 'the credit note got a language on insert');
+
+        // Inside the test transaction: rolled back with the rest.
+        $inactive = LangQuery::create()->findOneByLocale('it_IT')
+            ?? (new FixtureFactory($this->getPropelConnection()))->lang(['locale' => 'it_IT', 'code' => 'it', 'title' => 'Italiano']);
+        $inactive->setActive(false)->setByDefault(0)->save($this->getPropelConnection());
+        $this->loginAdmin();
+
+        $this->update($creditNote, $inactive->getId());
+        self::assertSame($before, CreditNoteQuery::create()->findPk($creditNote->getId())->getLangId());
+
+        $this->update($creditNote, 999999);
+        self::assertSame($before, CreditNoteQuery::create()->findPk($creditNote->getId())->getLangId());
+    }
+
+    private function numberedCreditNote(): CreditNoteModel
+    {
+        $customer = $this->fixture->customer();
+        $creditNote = $this->fixture->creditNote($customer, $this->fixture->paidOrder($customer), 'accepted');
+        $creditNote->save();
+        self::assertNotNull($creditNote->getInvoiceRef(), 'an accepted credit note is numbered');
+
+        return $creditNote;
+    }
+
+    private function update(CreditNoteModel $creditNote, int $langId): void
+    {
+        $this->client->request('POST', \sprintf('/admin/credit-note/%d/_update', $creditNote->getId()), [
+            'credit_note_create' => [
+                'action' => 'update',
+                'lang_id' => $langId,
+                'ui_target' => 'order',
+                'ui_target_id' => $creditNote->getOrderId(),
+            ],
+        ]);
+
+        self::assertTrue($this->client->getResponse()->isRedirection(), (string) $this->client->getResponse()->getContent());
+    }
+
+    private function activeLang(string $locale, string $code, string $title): Lang
+    {
+        // Inside the test transaction: rolled back with the rest.
+        $lang = LangQuery::create()->findOneByLocale($locale)
+            ?? (new FixtureFactory($this->getPropelConnection()))->lang(['locale' => $locale, 'code' => $code, 'title' => $title]);
+        $lang->setActive(true)->save($this->getPropelConnection());
+
+        return $lang;
+    }
+
+    private function loginAdmin(): void
+    {
+        // Built directly rather than through createFixtureFactory(): that helper pushes a
+        // synthetic request on the stack, which would become the main request the security
+        // context resolves the session from for every request the client sends afterwards.
+        $admin = (new FixtureFactory($this->getPropelConnection()))->admin();
+        $admin->eraseCredentials();
+        $this->injector->setAdmin($admin);
+    }
+}
diff --git a/tests/Integration/CreditNoteLanguageTest.php b/tests/Integration/CreditNoteLanguageTest.php
new file mode 100644
index 0000000..797302d
--- /dev/null
+++ b/tests/Integration/CreditNoteLanguageTest.php
@@ -0,0 +1,136 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CreditNote\Tests\Integration;
+
+use CreditNote\CreditNote;
+use CreditNote\Model\CreditNoteQuery;
+use CreditNote\Service\CreditNoteLanguage;
+use CreditNote\Tests\Support\CreditNoteFixture;
+use PHPUnit\Framework\Attributes\Test;
+use Thelia\Model\Lang;
+use Thelia\Model\LangQuery;
+use Thelia\Model\ModuleQuery;
+use Thelia\Test\IntegrationTestCase;
+
+/**
+ * A credit note gets a language when it is written: the one of its order, of its customer
+ * when it has no order, the default language of the shop otherwise. The back-office offers the
+ * active languages, plus the one the credit note already has.
+ */
+final class CreditNoteLanguageTest extends IntegrationTestCase
+{
+    private CreditNoteFixture $fixture;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        if (!ModuleQuery::create()->findOneByCode(CreditNote::getModuleCode())?->getActivate()) {
+            self::markTestSkipped('The CreditNote module is not active in the test database.');
+        }
+
+        $this->fixture = new CreditNoteFixture($this->getPropelConnection());
+    }
+
+    #[Test]
+    public function aCreditNoteOnAnOrderTakesTheLanguageOfTheOrder(): void
+    {
+        $customer = $this->fixture->customer();
+        $customer->setLangId($this->lang('fr_FR')->getId())->save($this->getPropelConnection());
+        $order = $this->fixture->paidOrder($customer);
+        $order->setLangId($this->german()->getId())->save($this->getPropelConnection());
+
+        $creditNote = $this->fixture->creditNote($customer, $order);
+        $creditNote->save();
+
+        self::assertSame($this->german()->getId(), CreditNoteQuery::create()->findPk($creditNote->getId())->getLangId());
+    }
+
+    #[Test]
+    public function aCreditNoteWithoutOrderTakesTheLanguageOfTheCustomer(): void
+    {
+        $customer = $this->fixture->customer();
+        $customer->setLangId($this->german()->getId())->save($this->getPropelConnection());
+
+        $creditNote = $this->fixture->creditNote($customer, null);
+        $creditNote->save();
+
+        self::assertSame($this->german()->getId(), CreditNoteQuery::create()->findPk($creditNote->getId())->getLangId());
+    }
+
+    #[Test]
+    public function aLanguageGivenByTheWriterIsKept(): void
+    {
+        $customer = $this->fixture->customer();
+        $order = $this->fixture->paidOrder($customer);
+        $order->setLangId($this->lang('fr_FR')->getId())->save($this->getPropelConnection());
+
+        $creditNote = $this->fixture->creditNote($customer, $order)->setLangId($this->german()->getId());
+        $creditNote->save();
+
+        self::assertSame($this->german()->getId(), CreditNoteQuery::create()->findPk($creditNote->getId())->getLangId());
+    }
+
+    #[Test]
+    public function withoutOrderNorCustomerLanguageTheDefaultLanguageOfTheShopAnswers(): void
+    {
+        $customer = $this->fixture->customer();
+        $creditNote = $this->fixture->creditNote($customer, null);
+        // A customer row always has a language in practice; the service is asked directly.
+        $creditNote->getCustomer()->setLangId(null);
+
+        $default = LangQuery::create()->findOneByByDefault(true);
+        self::assertNotNull($default, 'the shop has a default language');
+        self::assertSame($default->getId(), $this->language()->defaultFor($creditNote)?->getId());
+    }
+
+    #[Test]
+    public function theActiveLanguagesAndTheOwnLanguageOfTheCreditNoteAreSelectable(): void
+    {
+        $customer = $this->fixture->customer();
+        $creditNote = $this->fixture->creditNote($customer, $this->fixture->paidOrder($customer));
+        $creditNote->save();
+
+        // Inside the test transaction: rolled back with the rest.
+        $inactive = LangQuery::create()->findOneByLocale('it_IT')
+            ?? $this->fixture->factory()->lang(['locale' => 'it_IT', 'code' => 'it', 'title' => 'Italiano']);
+        $inactive->setActive(false)->setByDefault(0)->save($this->getPropelConnection());
+
+        self::assertFalse($this->language()->isSelectable($creditNote, $inactive->getId()), 'an inactive language is refused');
+        self::assertFalse($this->language()->isSelectable($creditNote, 999999), 'an unknown language is refused');
+
+        foreach (LangQuery::create()->filterByActive(true)->find() as $active) {
+            self::assertTrue($this->language()->isSelectable($creditNote, $active->getId()));
+        }
+
+        // A credit note printed in a language the shop turned off since keeps it.
+        $creditNote->setLangId($inactive->getId())->save($this->getPropelConnection());
+        self::assertTrue($this->language()->isSelectable($creditNote, $inactive->getId()));
+    }
+
+    private function language(): CreditNoteLanguage
+    {
+        return $this->getService(CreditNoteLanguage::class);
+    }
+
+    private function german(): Lang
+    {
+        // Active: a shop without demo data may have German turned off, or not at all.
+        $german = LangQuery::create()->findOneByLocale('de_DE')
+            ?? $this->fixture->factory()->lang(['locale' => 'de_DE', 'code' => 'de', 'title' => 'Deutsch']);
+
+        if (!$german->getActive()) {
+            $german->setActive(true)->save($this->getPropelConnection());
+        }
+
+        return $german;
+    }
+
+    private function lang(string $locale): Lang
+    {
+        return LangQuery::create()->findOneByLocale($locale)
+            ?? self::markTestSkipped(\sprintf('The %s language is not in the test database.', $locale));
+    }
+}

From 55b02303c4ce8a938ba2d79c1fdbd51c32bb12b9 Mon Sep 17 00:00:00 2001
From: Thomas Da Silva <tdasilva@openstudio.fr>
Date: Mon, 19 Oct 2026 15:12:22 +0200
Subject: [PATCH 02/12] fix: show the credit notes menu in the Twig back-office

Its script inserted the section after #orders_menu, an entry of the Smarty back-office that default-twig does not have, so the menu never showed. It now follows the Orders section, with the markup of the side menu.
---
 CHANGELOG.md                                  |  1 +
 .../CreditNote/hook/main.footer-js.html.twig  | 51 ++++++++-----------
 2 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4d4b72..2be692e 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Unreleased
 
 - A credit note has a language (`lang_id`), chosen in the back-office modal: the language of its order by default, of its customer without an order, the default language of the shop otherwise. It stays editable once the credit note is numbered, since it only changes the printed document. The document is printed in it (still within `document_locales`). The update fills the existing credit notes with the language they were printed in: the one of their customer, of their order when the customer has none.
+- The "Credit Notes" section of the admin side menu is back, right below "Orders": its script looked for the `#orders_menu` entry of the Smarty back-office, absent from default-twig.
 - Smarty is gone, as in Thelia 3: the Smarty plugin `credit_note_format_address`, the Smarty back-office and PDF templates, the Smarty fallback of the back-office hooks. The loops no Twig template calls are removed too: `credit-note-comment`, `credit-note-status`, `credit-note-type`, `order-credit-note` and `credit-note-version` (its table has not existed since 2.3.4). The loops `credit-note`, `credit-note-address` and `credit-note-detail` stay: the credit note document of the PDF template reads them.
 - The languages a credit note is printed in are a setting of the module (`document_locales`, locales separated by commas): a customer whose language is in the list gets the document in that language, the others the default language of the shop. Empty, as before: English and French. A shop whose PDF template is translated in German adds `de_DE`. The field refuses anything that is not a list of locales such as `fr_FR`.
 - Credit notes numbered like the invoices (`invoice_ref_with_thelia_order`) draw their number from `InvoiceRefSequence::next()` (InvoiceRef 3.1 or later): the counter is read under a lock shared with the orders, and a number an order already carries is skipped. The previous read and increment, without a lock, could hand the same number to an invoice and a credit note.
diff --git a/templates/backOffice/default-twig/CreditNote/hook/main.footer-js.html.twig b/templates/backOffice/default-twig/CreditNote/hook/main.footer-js.html.twig
index 1bb263e..bb77fde 100644
--- a/templates/backOffice/default-twig/CreditNote/hook/main.footer-js.html.twig
+++ b/templates/backOffice/default-twig/CreditNote/hook/main.footer-js.html.twig
@@ -1,24 +1,27 @@
-{# main.footer-js hook — injects a "Credit Notes" entry in the admin side menu. Data: menu_statuses, total_count. #}
+{# main.footer-js hook — injects a "Credit Notes" section right below the "Orders" one of the admin side menu
+   (_side_nav.html.twig of default-twig, which has no hook between sections), with the markup of its sections.
+   Data: menu_statuses, total_count. #}
 {% if is_granted('VIEW', 'admin.order') %}
+  {% set active = admin_current_location == 'credit-note' %}
   <template id="credit_note_menu-template">
-    <li class="{{ admin_current_location == 'credit-note' ? 'active' : '' }}" id="credit_note_menu">
-      <a title="{{ 'Credit Notes'|trans({}, 'creditnote.bo.default') }}" href="#collapse-credit-notes">
-        <span class="icon-orders"></span>
-        <span class="item-text">{{ 'Credit Notes'|trans({}, 'creditnote.bo.default') }}</span>
-        <i class="bi bi-chevron-right menu-collapse"></i>
+    <li class="nav-item" id="credit_note_menu" data-testid="bo-nav-credit-note">
+      <a href="#collapse-credit-notes" data-bs-toggle="collapse" aria-expanded="{{ active ? 'true' : 'false' }}" class="nav-link bo-side-nav__toggle {{ active ? 'active' : '' }}">
+        <i class="bi bi-receipt me-2" aria-hidden="true"></i>
+        {{ 'Credit Notes'|trans({}, 'creditnote.bo.default') }}
+        <i class="bi bi-chevron-right ms-auto bo-side-nav__chevron" aria-hidden="true"></i>
       </a>
-      <ul id="collapse-credit-notes" class="collapse {{ admin_current_location == 'credit-note' ? 'show' : '' }}" role="menu">
-        <li role="menuitem">
-          <a class="clearfix d-flex justify-content-between" href="{{ path('credit_note_list') }}">
-            <span>{{ 'All Credit Notes'|trans({}, 'creditnote.bo.default') }}</span>
-            <span class="badge text-bg-secondary">{{ total_count }}</span>
+      <ul class="nav flex-column collapse {{ active ? 'show' : '' }}" id="collapse-credit-notes">
+        <li>
+          <a class="nav-link" href="{{ path('credit_note_list') }}">
+            {{ 'All Credit Notes'|trans({}, 'creditnote.bo.default') }}
+            <span class="bo-side-nav__badge bo-side-nav__badge--neutral">{{ total_count }}</span>
           </a>
         </li>
         {% for status in menu_statuses %}
-          <li role="menuitem">
-            <a class="clearfix d-flex justify-content-between" href="{{ path('credit_note_list', {status_id: status.id}) }}">
-              <span>{{ status.title }}</span>
-              <span class="badge" style="background-color: {{ status.color }};">{{ status.count }}</span>
+          <li>
+            <a class="nav-link" href="{{ path('credit_note_list', {status_id: status.id}) }}">
+              {{ status.title }}
+              <span class="bo-side-nav__badge" style="background-color: {{ status.color }}; color: #fff;">{{ status.count }}</span>
             </a>
           </li>
         {% endfor %}
@@ -30,23 +33,11 @@
     "use strict";
     (function () {
       var tpl = document.getElementById('credit_note_menu-template');
-      var ordersMenu = document.getElementById('orders_menu');
-      if (!tpl || !ordersMenu) {
+      var ordersMenu = document.querySelector('[data-testid="bo-nav-order"]');
+      if (!tpl || !ordersMenu || document.getElementById('credit_note_menu')) {
         return;
       }
-      var node = tpl.content.cloneNode(true);
-      ordersMenu.parentNode.insertBefore(node, ordersMenu.nextSibling);
-
-      var trigger = document.querySelector('#credit_note_menu > a');
-      if (trigger) {
-        trigger.addEventListener('click', function (event) {
-          event.preventDefault();
-          var collapse = document.getElementById('collapse-credit-notes');
-          var item = document.getElementById('credit_note_menu');
-          collapse.classList.toggle('show');
-          item.classList.toggle('active');
-        });
-      }
+      ordersMenu.parentNode.insertBefore(tpl.content.cloneNode(true), ordersMenu.nextSibling);
     })();
   </script>
 {% endif %}

From 88178c7f2faf8d36ed1440097526c1d33184b517 Mon Sep 17 00:00:00 2001
From: Thomas Da Silva <tdasilva@openstudio.fr>
Date: Mon, 19 Oct 2026 15:12:28 +0200
Subject: [PATCH 03/12] fix: go back to the page and tab a credit note was
 opened from

The modal script sent that page as success-url in the request body, but the modal only read it from the query string, so a save always landed on the cart tab of the order. The page now carries the tab holding the trigger as fragment, the script reopens that tab, and only a path of the shop is followed: an absolute or protocol-relative success-url sends back to the order.
---
 CHANGELOG.md                                  |   1 +
 Controller/CreditNoteController.php           |  78 +++--------
 .../includes/credit-note-js.html.twig         |  37 +++++-
 .../ajax/credit-note-modal.html.twig          |   3 +-
 .../CreditNoteSaveRedirectTest.php            | 125 ++++++++++++++++++
 5 files changed, 182 insertions(+), 62 deletions(-)
 create mode 100644 tests/Integration/CreditNoteSaveRedirectTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2be692e..3704a38 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Unreleased
 
 - A credit note has a language (`lang_id`), chosen in the back-office modal: the language of its order by default, of its customer without an order, the default language of the shop otherwise. It stays editable once the credit note is numbered, since it only changes the printed document. The document is printed in it (still within `document_locales`). The update fills the existing credit notes with the language they were printed in: the one of their customer, of their order when the customer has none.
+- After creating, updating or deleting a credit note, the administrator is back on the page the modal was opened from, on the tab that held it ("Credit note" of an order): the modal script sends that page as `success-url`, which the modal kept only from the query string. A `success-url` outside the shop (absolute, protocol-relative) is no longer followed.
 - The "Credit Notes" section of the admin side menu is back, right below "Orders": its script looked for the `#orders_menu` entry of the Smarty back-office, absent from default-twig.
 - Smarty is gone, as in Thelia 3: the Smarty plugin `credit_note_format_address`, the Smarty back-office and PDF templates, the Smarty fallback of the back-office hooks. The loops no Twig template calls are removed too: `credit-note-comment`, `credit-note-status`, `credit-note-type`, `order-credit-note` and `credit-note-version` (its table has not existed since 2.3.4). The loops `credit-note`, `credit-note-address` and `credit-note-detail` stay: the credit note document of the PDF template reads them.
 - The languages a credit note is printed in are a setting of the module (`document_locales`, locales separated by commas): a customer whose language is in the list gets the document in that language, the others the default language of the shop. Empty, as before: English and French. A shop whose PDF template is translated in German adds `de_DE`. The field refuses anything that is not a list of locales such as `fr_FR`.
diff --git a/Controller/CreditNoteController.php b/Controller/CreditNoteController.php
index f822b39..d81e362 100755
--- a/Controller/CreditNoteController.php
+++ b/Controller/CreditNoteController.php
@@ -62,6 +62,7 @@
 use Thelia\Model\TaxRuleQuery;
 use CreditNote\CreditNote as CreditNoteModule;
 use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Thelia\Tools\URL;
 
 /**
@@ -179,27 +180,7 @@ public function createAction(Request $request, EventDispatcherInterface $eventDi
             throw $e;
         }
 
-        if (null !== $successUrl = ($request->request->get('success-url') ?? $request->query->get('success-url'))) {
-            return new RedirectResponse($successUrl);
-        }
-
-        if (null !== $creditNote->getOrder()) {
-            return $this->generateRedirectFromRoute(
-                'admin.order.update.view',
-                [
-                    'tab' => 'credit-note'
-                ],
-                [
-                    'order_id' => $creditNote->getOrder()->getId()
-                ]
-            );
-        }
-
-        if (null !== $creditNote->getCustomer()) {
-            return $this->generateRedirectFromRoute('admin.customer.update.view', [], [
-                'customer_id' => $creditNote->getCustomer()->getId()
-            ]);
-        }
+        return $this->redirectAfterSave($request, $creditNote);
     }
 
     /**
@@ -256,27 +237,28 @@ public function updateAction(Request $request, $id, EventDispatcherInterface $ev
             throw $e;
         }
 
-        if (null !== $successUrl = ($request->request->get('success-url') ?? $request->query->get('success-url'))) {
+        return $this->redirectAfterSave($request, $creditNote);
+    }
+
+    /**
+     * Back to the page the modal was opened from (`success-url`, sent by the modal script with
+     * the tab to reopen as fragment), otherwise to the credit notes of the order, or of the
+     * customer. Only a path of this shop is followed: an absolute or protocol-relative address
+     * would send the administrator to another site.
+     */
+    private function redirectAfterSave(Request $request, CreditNote $creditNote): RedirectResponse
+    {
+        $successUrl = (string) ($request->request->get('success-url') ?? $request->query->get('success-url') ?? '');
+
+        if (str_starts_with($successUrl, '/') && !str_starts_with($successUrl, '//') && !str_contains($successUrl, '\\')) {
             return new RedirectResponse($successUrl);
         }
 
-        if (null !== $creditNote->getOrder()) {
-            return $this->generateRedirectFromRoute(
-                'admin.order.update.view',
-                [
-                    'tab' => 'credit-note'
-                ],
-                [
-                    'order_id' => $creditNote->getOrder()->getId()
-                ]
-            );
+        if (null !== $creditNote->getOrderId()) {
+            return new RedirectResponse($this->getRoute('admin.order.update.view', ['order_id' => $creditNote->getOrderId()], UrlGeneratorInterface::ABSOLUTE_PATH) . '#credit-note');
         }
 
-        if (null !== $creditNote->getCustomer()) {
-            return $this->generateRedirectFromRoute('admin.customer.update.view', [], [
-                'customer_id' => $creditNote->getCustomer()->getId()
-            ]);
-        }
+        return new RedirectResponse($this->getRoute('admin.customer.update.view', ['customer_id' => $creditNote->getCustomerId()], UrlGeneratorInterface::ABSOLUTE_PATH) . '#module-credit-note');
     }
 
     #[Route('/credit-note/{id}/_delete', name: '_delete', methods: 'POST', requirements: ['id' => '\d+'])]
@@ -295,27 +277,7 @@ public function deleteAction(Request $request, $id, Translator $translator)
             CreditNoteQuery::create()->filterById($id)->delete();
         }
 
-        if (null !== $successUrl = ($request->request->get('success-url') ?? $request->query->get('success-url'))) {
-            return new RedirectResponse($successUrl);
-        }
-
-        if (null !== $creditNote->getOrder()) {
-            return $this->generateRedirectFromRoute(
-                'admin.order.update.view',
-                [
-                    'tab' => 'credit-note'
-                ],
-                [
-                    'order_id' => $creditNote->getOrder()->getId()
-                ]
-            );
-        }
-
-        if (null !== $creditNote->getCustomer()) {
-            return $this->generateRedirectFromRoute('admin.customer.update.view', [], [
-                'customer_id' => $creditNote->getCustomer()->getId()
-            ]);
-        }
+        return $this->redirectAfterSave($request, $creditNote);
     }
 
     /**
diff --git a/templates/backOffice/default-twig/CreditNote/includes/credit-note-js.html.twig b/templates/backOffice/default-twig/CreditNote/includes/credit-note-js.html.twig
index 2661ab6..46f45c6 100644
--- a/templates/backOffice/default-twig/CreditNote/includes/credit-note-js.html.twig
+++ b/templates/backOffice/default-twig/CreditNote/includes/credit-note-js.html.twig
@@ -2,13 +2,44 @@
 <script type="text/javascript">
 "use strict";
 (function () {
+  /* The page a modal was opened from, back on the tab or block holding its trigger (#credit-note on an
+     order): where the module sends the administrator after a save or a delete. */
+  function returnUrl(trigger) {
+    // The tab first: on an order the credit note block sits inside the tab.
+    var holder = trigger && trigger.closest ? (trigger.closest('.tab-pane[id]') || trigger.closest('#module-credit-note')) : null;
+    return window.location.pathname + window.location.search + (holder ? '#' + holder.id : '');
+  }
+
+  /* ---- back from a save: reopen the tab the fragment names ---- */
+  function showTabFromHash() {
+    var id = window.location.hash.slice(1);
+    if (!/^[\w-]+$/.test(id)) return;
+    var toggle = document.querySelector('[data-bs-toggle="tab"][data-bs-target="#' + id + '"]');
+    if (toggle) toggle.click();
+  }
+  if (document.readyState === 'loading') {
+    document.addEventListener('DOMContentLoaded', showTabFromHash);
+  } else {
+    showTabFromHash();
+  }
+
   /* ---- delete modal: copy the trigger's ajax-url into the form action ---- */
   var delModal = document.getElementById('modal-credit-note-delete');
   if (delModal) {
     delModal.addEventListener('show.bs.modal', function (event) {
-      var url = event.relatedTarget && event.relatedTarget.dataset.ajaxUrl;
+      var trigger = event.relatedTarget;
+      var url = trigger && trigger.dataset.ajaxUrl;
       var form = delModal.querySelector('form');
-      if (url && form) form.setAttribute('action', url);
+      if (!url || !form) return;
+      form.setAttribute('action', url);
+      var back = form.querySelector('input[name="success-url"]');
+      if (!back) {
+        back = document.createElement('input');
+        back.type = 'hidden';
+        back.name = 'success-url';
+        form.appendChild(back);
+      }
+      back.value = trigger.dataset.successUrl || returnUrl(trigger);
     });
   }
 
@@ -62,7 +93,7 @@
     params = params || new URLSearchParams();
     if (trigger && trigger.dataset) {
       var d = trigger.dataset;
-      if (d.successUrl) params.set('success-url', d.successUrl);
+      params.set('success-url', d.successUrl || returnUrl(trigger));
       if (d.creditNoteId) params.set('credit_note_create[credit_note_id]', d.creditNoteId);
       if (d.orderId) params.set('credit_note_create[order_id]', d.orderId);
       if (d.orderProductId) params.set('credit_note_create[order_product_quantity][' + d.orderProductId + ']', '1');
diff --git a/templates/backOffice/default-twig/ajax/credit-note-modal.html.twig b/templates/backOffice/default-twig/ajax/credit-note-modal.html.twig
index 06c41bc..5f41037 100644
--- a/templates/backOffice/default-twig/ajax/credit-note-modal.html.twig
+++ b/templates/backOffice/default-twig/ajax/credit-note-modal.html.twig
@@ -6,7 +6,8 @@
 {% set readonly = invoiced ? 'disabled' : '' %}
 
 <form method="POST" action="{{ cn.id ? path('credit_note_update', {id: cn.id}) : path('credit_note_create') }}">
-  {% set successUrl = app.request.query.get('success-url') %}
+  {# Sent in the body by the modal script (the page and tab to go back to), kept through every refresh. #}
+  {% set successUrl = app.request.request.get('success-url') ?? app.request.query.get('success-url') %}
   {% if successUrl %}<input type="hidden" name="success-url" value="{{ successUrl }}">{% endif %}
 
   <input type="hidden" name="credit_note_create[action]" value="{{ cn.id ? 'update' : 'create' }}">
diff --git a/tests/Integration/CreditNoteSaveRedirectTest.php b/tests/Integration/CreditNoteSaveRedirectTest.php
new file mode 100644
index 0000000..744cdf0
--- /dev/null
+++ b/tests/Integration/CreditNoteSaveRedirectTest.php
@@ -0,0 +1,125 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CreditNote\Tests\Integration;
+
+use CreditNote\CreditNote;
+use CreditNote\Model\CreditNote as CreditNoteModel;
+use CreditNote\Tests\Support\AdminSessionInjector;
+use CreditNote\Tests\Support\CreditNoteFixture;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Thelia\Model\ModuleQuery;
+use Thelia\Test\FixtureFactory;
+use Thelia\Test\WebIntegrationTestCase;
+
+/**
+ * After a save, the administrator goes back to the page the modal was opened from, on the tab
+ * that held it (`success-url`, sent by the modal script). Only a path of the shop is followed:
+ * any other address sends back to the credit notes of the order.
+ */
+final class CreditNoteSaveRedirectTest extends WebIntegrationTestCase
+{
+    private CreditNoteFixture $fixture;
+
+    private AdminSessionInjector $injector;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        if (!ModuleQuery::create()->findOneByCode(CreditNote::getModuleCode())?->getActivate()) {
+            self::markTestSkipped('The CreditNote module is not active in the test database.');
+        }
+
+        $this->fixture = new CreditNoteFixture($this->getPropelConnection());
+        $this->injector = new AdminSessionInjector();
+        $this->getService(EventDispatcherInterface::class)->addSubscriber($this->injector);
+    }
+
+    protected function tearDown(): void
+    {
+        if (isset($this->injector)) {
+            $this->injector->clear();
+        }
+
+        parent::tearDown();
+    }
+
+    #[Test]
+    public function theAdministratorGoesBackToThePageAndTabTheModalWasOpenedFrom(): void
+    {
+        $creditNote = $this->creditNote();
+        $this->loginAdmin();
+
+        $this->update($creditNote, '/admin/order/update/42?foo=bar#credit-note');
+
+        self::assertSame('/admin/order/update/42?foo=bar#credit-note', $this->client->getResponse()->headers->get('Location'));
+    }
+
+    #[Test]
+    #[DataProvider('foreignAddresses')]
+    public function anAddressOutsideTheShopSendsBackToTheCreditNotesOfTheOrder(?string $successUrl): void
+    {
+        $creditNote = $this->creditNote();
+        $this->loginAdmin();
+
+        $this->update($creditNote, $successUrl);
+
+        self::assertSame(
+            \sprintf('/admin/order/update/%d#credit-note', $creditNote->getOrderId()),
+            $this->client->getResponse()->headers->get('Location'),
+        );
+    }
+
+    /**
+     * @return iterable<string, array{?string}>
+     */
+    public static function foreignAddresses(): iterable
+    {
+        yield 'none' => [null];
+        yield 'absolute' => ['https://example.com/admin'];
+        yield 'protocol-relative' => ['//example.com/admin'];
+        yield 'backslash' => ['/\\example.com'];
+    }
+
+    private function creditNote(): CreditNoteModel
+    {
+        $customer = $this->fixture->customer();
+        $creditNote = $this->fixture->creditNote($customer, $this->fixture->paidOrder($customer), 'accepted');
+        $creditNote->save();
+
+        return $creditNote;
+    }
+
+    private function update(CreditNoteModel $creditNote, ?string $successUrl): void
+    {
+        $parameters = [
+            'credit_note_create' => [
+                'action' => 'update',
+                'ui_target' => 'order',
+                'ui_target_id' => $creditNote->getOrderId(),
+            ],
+        ];
+
+        if (null !== $successUrl) {
+            $parameters['success-url'] = $successUrl;
+        }
+
+        $this->client->request('POST', \sprintf('/admin/credit-note/%d/_update', $creditNote->getId()), $parameters);
+
+        self::assertTrue($this->client->getResponse()->isRedirection(), (string) $this->client->getResponse()->getContent());
+    }
+
+    private function loginAdmin(): void
+    {
+        // Built directly rather than through createFixtureFactory(): that helper pushes a
+        // synthetic request on the stack, which would become the main request the security
+        // context resolves the session from for every request the client sends afterwards.
+        $admin = (new FixtureFactory($this->getPropelConnection()))->admin();
+        $admin->eraseCredentials();
+        $this->injector->setAdmin($admin);
+    }
+}

From de2ae0396a52dd91a3d767d76824f189733b8c64 Mon Sep 17 00:00:00 2001
From: Thomas Da Silva <tdasilva@openstudio.fr>
Date: Mon, 19 Oct 2026 15:12:33 +0200
Subject: [PATCH 04/12] chore: bump module version to 4.3.0

---
 Config/module.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Config/module.xml b/Config/module.xml
index e7cfc59..37f3621 100755
--- a/Config/module.xml
+++ b/Config/module.xml
@@ -17,7 +17,7 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>4.2.0</version>
+    <version>4.3.0</version>
     <author>
         <name>Gilles Bourgeat</name>
         <email>gbourgeat@openstudio.fr</email>

From aeda2e301f3e697ded8f0838432ae74f5c5c554d Mon Sep 17 00:00:00 2001
From: Thomas Da Silva <tdasilva@openstudio.fr>
Date: Mon, 19 Oct 2026 15:46:30 +0200
Subject: [PATCH 05/12] fix: follow only a printable path of the shop after a
 save

Browsers drop tabs and line breaks from an address, so "/<tab>/host" passed the filter and became the protocol-relative "//host" of another site; a trailing line break passed the "$" anchor. The success-url is now a path in printable ASCII, without backslash, anchored with the D modifier.
---
 CHANGELOG.md                                     | 2 +-
 Controller/CreditNoteController.php              | 7 ++++---
 tests/Integration/CreditNoteSaveRedirectTest.php | 4 ++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3704a38..fc3de4d 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Unreleased
 
 - A credit note has a language (`lang_id`), chosen in the back-office modal: the language of its order by default, of its customer without an order, the default language of the shop otherwise. It stays editable once the credit note is numbered, since it only changes the printed document. The document is printed in it (still within `document_locales`). The update fills the existing credit notes with the language they were printed in: the one of their customer, of their order when the customer has none.
-- After creating, updating or deleting a credit note, the administrator is back on the page the modal was opened from, on the tab that held it ("Credit note" of an order): the modal script sends that page as `success-url`, which the modal kept only from the query string. A `success-url` outside the shop (absolute, protocol-relative) is no longer followed.
+- After creating, updating or deleting a credit note, the administrator is back on the page the modal was opened from, on the tab that held it ("Credit note" of an order): the modal script sends that page as `success-url`, which the modal kept only from the query string. Only a path of the shop in printable ASCII is followed: an absolute or protocol-relative `success-url`, or one carrying a tab or a line break that the browser would drop, sends back to the order.
 - The "Credit Notes" section of the admin side menu is back, right below "Orders": its script looked for the `#orders_menu` entry of the Smarty back-office, absent from default-twig.
 - Smarty is gone, as in Thelia 3: the Smarty plugin `credit_note_format_address`, the Smarty back-office and PDF templates, the Smarty fallback of the back-office hooks. The loops no Twig template calls are removed too: `credit-note-comment`, `credit-note-status`, `credit-note-type`, `order-credit-note` and `credit-note-version` (its table has not existed since 2.3.4). The loops `credit-note`, `credit-note-address` and `credit-note-detail` stay: the credit note document of the PDF template reads them.
 - The languages a credit note is printed in are a setting of the module (`document_locales`, locales separated by commas): a customer whose language is in the list gets the document in that language, the others the default language of the shop. Empty, as before: English and French. A shop whose PDF template is translated in German adds `de_DE`. The field refuses anything that is not a list of locales such as `fr_FR`.
diff --git a/Controller/CreditNoteController.php b/Controller/CreditNoteController.php
index d81e362..f83160b 100755
--- a/Controller/CreditNoteController.php
+++ b/Controller/CreditNoteController.php
@@ -243,14 +243,15 @@ public function updateAction(Request $request, $id, EventDispatcherInterface $ev
     /**
      * Back to the page the modal was opened from (`success-url`, sent by the modal script with
      * the tab to reopen as fragment), otherwise to the credit notes of the order, or of the
-     * customer. Only a path of this shop is followed: an absolute or protocol-relative address
-     * would send the administrator to another site.
+     * customer. Only a path of this shop is followed, in printable ASCII and without backslash:
+     * the browser drops tabs and line breaks from an address, so "/\t/host" would become the
+     * protocol-relative "//host" of another site.
      */
     private function redirectAfterSave(Request $request, CreditNote $creditNote): RedirectResponse
     {
         $successUrl = (string) ($request->request->get('success-url') ?? $request->query->get('success-url') ?? '');
 
-        if (str_starts_with($successUrl, '/') && !str_starts_with($successUrl, '//') && !str_contains($successUrl, '\\')) {
+        if (1 === preg_match('#^/(?!/)[\x21-\x5B\x5D-\x7E]*$#D', $successUrl)) {
             return new RedirectResponse($successUrl);
         }
 
diff --git a/tests/Integration/CreditNoteSaveRedirectTest.php b/tests/Integration/CreditNoteSaveRedirectTest.php
index 744cdf0..650a0ef 100644
--- a/tests/Integration/CreditNoteSaveRedirectTest.php
+++ b/tests/Integration/CreditNoteSaveRedirectTest.php
@@ -83,6 +83,10 @@ public static function foreignAddresses(): iterable
         yield 'absolute' => ['https://example.com/admin'];
         yield 'protocol-relative' => ['//example.com/admin'];
         yield 'backslash' => ['/\\example.com'];
+        yield 'tab' => ["/\t/example.com"];
+        yield 'line break' => ["/\n/example.com"];
+        yield 'space' => ['/ /example.com'];
+        yield 'trailing line break' => ["/admin/order/update/42\n"];
     }
 
     private function creditNote(): CreditNoteModel

From d32afecae0179fcb288c6ccf73bbf366734bf7d0 Mon Sep 17 00:00:00 2001
From: Thomas Da Silva <tdasilva@openstudio.fr>
Date: Mon, 19 Oct 2026 15:46:39 +0200
Subject: [PATCH 06/12] fix: validate badge colors before writing them in a
 style attribute

HTML escaping does not protect a style attribute: a status or type color that is not a hexadecimal color now falls back to grey (BadgeColor), in the side menu, the lists, the order lines and the modal.
---
 CHANGELOG.md                         |  1 +
 Helper/BadgeColor.php                | 19 ++++++++++
 Service/CreditNoteHookPresenter.php  |  9 ++---
 Service/CreditNoteModalPresenter.php |  5 +--
 tests/Unit/BadgeColorTest.php        | 53 ++++++++++++++++++++++++++++
 5 files changed, 81 insertions(+), 6 deletions(-)
 create mode 100644 Helper/BadgeColor.php
 create mode 100644 tests/Unit/BadgeColorTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc3de4d..d9eb82a 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Unreleased
 
 - A credit note has a language (`lang_id`), chosen in the back-office modal: the language of its order by default, of its customer without an order, the default language of the shop otherwise. It stays editable once the credit note is numbered, since it only changes the printed document. The document is printed in it (still within `document_locales`). The update fills the existing credit notes with the language they were printed in: the one of their customer, of their order when the customer has none.
+- The colors of the status and type badges are written into `style` attributes only when they are hexadecimal colors, grey otherwise.
 - After creating, updating or deleting a credit note, the administrator is back on the page the modal was opened from, on the tab that held it ("Credit note" of an order): the modal script sends that page as `success-url`, which the modal kept only from the query string. Only a path of the shop in printable ASCII is followed: an absolute or protocol-relative `success-url`, or one carrying a tab or a line break that the browser would drop, sends back to the order.
 - The "Credit Notes" section of the admin side menu is back, right below "Orders": its script looked for the `#orders_menu` entry of the Smarty back-office, absent from default-twig.
 - Smarty is gone, as in Thelia 3: the Smarty plugin `credit_note_format_address`, the Smarty back-office and PDF templates, the Smarty fallback of the back-office hooks. The loops no Twig template calls are removed too: `credit-note-comment`, `credit-note-status`, `credit-note-type`, `order-credit-note` and `credit-note-version` (its table has not existed since 2.3.4). The loops `credit-note`, `credit-note-address` and `credit-note-detail` stay: the credit note document of the PDF template reads them.
diff --git a/Helper/BadgeColor.php b/Helper/BadgeColor.php
new file mode 100644
index 0000000..d31f133
--- /dev/null
+++ b/Helper/BadgeColor.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CreditNote\Helper;
+
+/**
+ * The color of a status or type badge, written into a `style` attribute: HTML escaping does not
+ * protect that context, so anything other than a hexadecimal color falls back to grey.
+ */
+final class BadgeColor
+{
+    public const FALLBACK = '#777';
+
+    public static function css(?string $color): string
+    {
+        return null !== $color && 1 === preg_match('/^#[0-9a-fA-F]{3,8}$/D', $color) ? $color : self::FALLBACK;
+    }
+}
diff --git a/Service/CreditNoteHookPresenter.php b/Service/CreditNoteHookPresenter.php
index e44bb09..e9b777a 100644
--- a/Service/CreditNoteHookPresenter.php
+++ b/Service/CreditNoteHookPresenter.php
@@ -4,6 +4,7 @@
 
 namespace CreditNote\Service;
 
+use CreditNote\Helper\BadgeColor;
 use CreditNote\Model\CreditNoteQuery;
 use CreditNote\Model\CreditNoteStatusQuery;
 use CreditNote\Model\CreditNoteDetailQuery;
@@ -134,9 +135,9 @@ private function row(\CreditNote\Model\CreditNote $creditNote, string $locale):
             'order_ref' => $order?->getRef(),
             'currency_id' => $creditNote->getCurrencyId(),
             'status_title' => $status?->setLocale($locale)->getTitle() ?? '',
-            'status_color' => $status?->getColor() ?? '#777',
+            'status_color' => BadgeColor::css($status?->getColor()),
             'type_title' => $type?->setLocale($locale)->getTitle() ?? '',
-            'type_color' => $type?->getColor() ?? '#777',
+            'type_color' => BadgeColor::css($type?->getColor()),
             'total_price' => $this->formatMoney($creditNote->getTotalPrice(), $creditNote->getCurrencyId()),
             'total_price_with_tax' => $this->formatMoney($creditNote->getTotalPriceWithTax(), $creditNote->getCurrencyId()),
         ];
@@ -201,7 +202,7 @@ public function detailRowsForOrderProduct(int $orderProductId, string $locale):
                 'credit_note_id' => $creditNote?->getId(),
                 'ref' => $creditNote?->getRef(),
                 'status_title' => $status?->setLocale($locale)->getTitle() ?? '',
-                'status_color' => $status?->getColor() ?? '#777',
+                'status_color' => BadgeColor::css($status?->getColor()),
                 'quantity' => $detail->getQuantity(),
             ];
         }
@@ -228,7 +229,7 @@ public function menuStatuses(string $locale): array
             $entries[] = [
                 'id' => $status->getId(),
                 'title' => $status->setLocale($locale)->getTitle(),
-                'color' => $status->getColor(),
+                'color' => BadgeColor::css($status->getColor()),
                 'count' => $count,
             ];
         }
diff --git a/Service/CreditNoteModalPresenter.php b/Service/CreditNoteModalPresenter.php
index f17624d..6ece763 100644
--- a/Service/CreditNoteModalPresenter.php
+++ b/Service/CreditNoteModalPresenter.php
@@ -4,6 +4,7 @@
 
 namespace CreditNote\Service;
 
+use CreditNote\Helper\BadgeColor;
 use CreditNote\Helper\CreditNoteHelper;
 use CreditNote\Model\CreditNote;
 use CreditNote\Model\CreditNoteCommentQuery;
@@ -136,7 +137,7 @@ private function statuses(string $locale): array
             $out[] = [
                 'id' => $status->getId(),
                 'title' => $title !== null && $title !== '' ? $title : $status->getCode(),
-                'color' => $status->getColor() ?? '#777',
+                'color' => BadgeColor::css($status->getColor()),
             ];
         }
 
@@ -167,7 +168,7 @@ private function types(string $locale): array
             $out[] = [
                 'id' => $type->getId(),
                 'title' => $title !== null && $title !== '' ? $title : $type->getCode(),
-                'color' => $type->getColor() ?? '#777',
+                'color' => BadgeColor::css($type->getColor()),
             ];
         }
 
diff --git a/tests/Unit/BadgeColorTest.php b/tests/Unit/BadgeColorTest.php
new file mode 100644
index 0000000..6ec3142
--- /dev/null
+++ b/tests/Unit/BadgeColorTest.php
@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CreditNote\Tests\Unit;
+
+use CreditNote\Helper\BadgeColor;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * A badge color reaches a `style` attribute as is only when it is a hexadecimal color.
+ */
+final class BadgeColorTest extends TestCase
+{
+    #[Test]
+    #[DataProvider('hexadecimalColors')]
+    public function aHexadecimalColorIsKept(string $color): void
+    {
+        self::assertSame($color, BadgeColor::css($color));
+    }
+
+    /**
+     * @return iterable<string, array{string}>
+     */
+    public static function hexadecimalColors(): iterable
+    {
+        yield 'short' => ['#777'];
+        yield 'long' => ['#00cc00'];
+        yield 'upper case' => ['#CF7973'];
+        yield 'with alpha' => ['#3399ffcc'];
+    }
+
+    #[Test]
+    #[DataProvider('otherValues')]
+    public function anythingElseFallsBackToGrey(?string $color): void
+    {
+        self::assertSame(BadgeColor::FALLBACK, BadgeColor::css($color));
+    }
+
+    /**
+     * @return iterable<string, array{?string}>
+     */
+    public static function otherValues(): iterable
+    {
+        yield 'none' => [null];
+        yield 'empty' => [''];
+        yield 'name' => ['red'];
+        yield 'declaration injected' => ['#fff;background-image:url(https://example.com/)'];
+        yield 'line break' => ["#fff\n"];
+    }
+}

From 7189ed179937f558f009c7144aab2eb9d972d44c Mon Sep 17 00:00:00 2001
From: Thomas Da Silva <tdasilva@openstudio.fr>
Date: Mon, 19 Oct 2026 15:46:39 +0200
Subject: [PATCH 07/12] fix: fill the language of existing credit notes with
 existing languages only

The update runs with the foreign key checks off: a customer or order pointing to a deleted language would have left a dangling lang_id.
---
 Config/Update/sql/4.3.0.sql | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Config/Update/sql/4.3.0.sql b/Config/Update/sql/4.3.0.sql
index 7632076..72afeae 100644
--- a/Config/Update/sql/4.3.0.sql
+++ b/Config/Update/sql/4.3.0.sql
@@ -11,11 +11,14 @@ ALTER TABLE `credit_note` ADD CONSTRAINT `credit_note_FK_8`
     ON DELETE SET NULL;
 
 # The existing credit notes keep the language they were printed in until now: the one of their
-# customer, or of their order when the customer has none.
+# customer, or of their order when the customer has none. Only a language that exists: the foreign
+# key checks are off in this script.
 UPDATE `credit_note`
     LEFT JOIN `customer` ON `customer`.`id` = `credit_note`.`customer_id`
+    LEFT JOIN `lang` `customer_lang` ON `customer_lang`.`id` = `customer`.`lang_id`
     LEFT JOIN `order` ON `order`.`id` = `credit_note`.`order_id`
-SET `credit_note`.`lang_id` = COALESCE(`customer`.`lang_id`, `order`.`lang_id`)
+    LEFT JOIN `lang` `order_lang` ON `order_lang`.`id` = `order`.`lang_id`
+SET `credit_note`.`lang_id` = COALESCE(`customer_lang`.`id`, `order_lang`.`id`)
 WHERE `credit_note`.`lang_id` IS NULL;
 
 # This restores the fkey checks, after having unset them earlier

From 20b55969e4b001b9353819c68b1e451414c72410 Mon Sep 17 00:00:00 2001
From: Thomas Da Silva <tdasilva@openstudio.fr>
Date: Mon, 19 Oct 2026 15:46:40 +0200
Subject: [PATCH 08/12] refactor: check a selectable language in a single query

Also say why a credit note without a language still prints in the language of its customer.
---
 Service/CreditNoteDocumentLocale.php | 5 +++++
 Service/CreditNoteLanguage.php       | 9 ++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Service/CreditNoteDocumentLocale.php b/Service/CreditNoteDocumentLocale.php
index 180bab4..fb72e66 100644
--- a/Service/CreditNoteDocumentLocale.php
+++ b/Service/CreditNoteDocumentLocale.php
@@ -36,6 +36,11 @@ public function forCreditNote(CreditNoteModel $creditNote): string
         return null !== $defaultLocale && '' !== $defaultLocale ? $defaultLocale : self::FALLBACK;
     }
 
+    /**
+     * The customer answers for a credit note without a language only: one written before credit
+     * notes had a language, printed in the language of its customer until then. A new credit
+     * note always gets one on insert (CreditNoteLanguage::defaultFor()).
+     */
     private function requestedLocale(CreditNoteModel $creditNote): ?string
     {
         $langId = $creditNote->getLangId() ?? $creditNote->getCustomer()?->getLangId();
diff --git a/Service/CreditNoteLanguage.php b/Service/CreditNoteLanguage.php
index 7e42dd6..fe0d5db 100644
--- a/Service/CreditNoteLanguage.php
+++ b/Service/CreditNoteLanguage.php
@@ -43,12 +43,7 @@ public function selectable(CreditNoteModel $creditNote): array
 
     public function isSelectable(CreditNoteModel $creditNote, int $langId): bool
     {
-        foreach ($this->selectable($creditNote) as $lang) {
-            if ($lang->getId() === $langId) {
-                return true;
-            }
-        }
-
-        return false;
+        return $langId === $creditNote->getLangId()
+            || LangQuery::create()->filterById($langId)->filterByActive(true)->exists();
     }
 }

From 71ce147c3c8335ddb2f7213234de237a92abf1e8 Mon Sep 17 00:00:00 2001
From: Thomas Da Silva <tdasilva@openstudio.fr>
Date: Mon, 19 Oct 2026 15:46:40 +0200
Subject: [PATCH 09/12] docs: name the side menu entry the credit notes section
 follows

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9eb82a..509f37b 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 - A credit note has a language (`lang_id`), chosen in the back-office modal: the language of its order by default, of its customer without an order, the default language of the shop otherwise. It stays editable once the credit note is numbered, since it only changes the printed document. The document is printed in it (still within `document_locales`). The update fills the existing credit notes with the language they were printed in: the one of their customer, of their order when the customer has none.
 - The colors of the status and type badges are written into `style` attributes only when they are hexadecimal colors, grey otherwise.
 - After creating, updating or deleting a credit note, the administrator is back on the page the modal was opened from, on the tab that held it ("Credit note" of an order): the modal script sends that page as `success-url`, which the modal kept only from the query string. Only a path of the shop in printable ASCII is followed: an absolute or protocol-relative `success-url`, or one carrying a tab or a line break that the browser would drop, sends back to the order.
-- The "Credit Notes" section of the admin side menu is back, right below "Orders": its script looked for the `#orders_menu` entry of the Smarty back-office, absent from default-twig.
+- The "Credit Notes" section of the admin side menu is back, right below "Orders": its script looked for the `#orders_menu` entry of the Smarty back-office, absent from default-twig. It now follows the entry `[data-testid="bo-nav-order"]` of the default-twig side menu, which has no hook between sections.
 - Smarty is gone, as in Thelia 3: the Smarty plugin `credit_note_format_address`, the Smarty back-office and PDF templates, the Smarty fallback of the back-office hooks. The loops no Twig template calls are removed too: `credit-note-comment`, `credit-note-status`, `credit-note-type`, `order-credit-note` and `credit-note-version` (its table has not existed since 2.3.4). The loops `credit-note`, `credit-note-address` and `credit-note-detail` stay: the credit note document of the PDF template reads them.
 - The languages a credit note is printed in are a setting of the module (`document_locales`, locales separated by commas): a customer whose language is in the list gets the document in that language, the others the default language of the shop. Empty, as before: English and French. A shop whose PDF template is translated in German adds `de_DE`. The field refuses anything that is not a list of locales such as `fr_FR`.
 - Credit notes numbered like the invoices (`invoice_ref_with_thelia_order`) draw their number from `InvoiceRefSequence::next()` (InvoiceRef 3.1 or later): the counter is read under a lock shared with the orders, and a number an order already carries is skipped. The previous read and increment, without a lock, could hand the same number to an invoice and a credit note.

From 8a844a1929fc1732e4bbbfb5e1091f4cfe20dbb4 Mon Sep 17 00:00:00 2001
From: Thomas Da Silva <tdasilva@openstudio.fr>
Date: Mon, 19 Oct 2026 16:48:20 +0200
Subject: [PATCH 10/12] fix(#122): offer each language once in the credit note
 modal

---
 I18n/backOffice/default/en_US.php             |  1 -
 I18n/backOffice/default/fr_FR.php             |  1 -
 Service/CreditNoteModalPresenter.php          | 15 ++++++++++---
 .../ajax/credit-note-modal.html.twig          |  4 ++--
 .../CreditNoteLanguageRouteTest.php           | 22 +++++++++++++++++++
 5 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/I18n/backOffice/default/en_US.php b/I18n/backOffice/default/en_US.php
index 09c9147..59cefa7 100755
--- a/I18n/backOffice/default/en_US.php
+++ b/I18n/backOffice/default/en_US.php
@@ -41,7 +41,6 @@
     'Credit Notes' => 'Credit notes',
     'Customer' => 'Customer',
     'Customer :' => 'Customer:',
-    'Default (%language)' => 'Default (%language)',
     'Delete' => 'Delete',
     'Delete credit note' => 'Delete the credit note',
     'Discount' => 'Discount',
diff --git a/I18n/backOffice/default/fr_FR.php b/I18n/backOffice/default/fr_FR.php
index c9e3097..321c65c 100755
--- a/I18n/backOffice/default/fr_FR.php
+++ b/I18n/backOffice/default/fr_FR.php
@@ -49,7 +49,6 @@
     'Customer' => 'Client',
     'Customer :' => 'Client :',
     'Customer : ' => 'Client :',
-    'Default (%language)' => 'Par défaut (%language)',
     'Delete' => 'Supprimer',
     'Delete credit note' => 'Supprimer cet avoir',
     'Discount' => 'Réduction',
diff --git a/Service/CreditNoteModalPresenter.php b/Service/CreditNoteModalPresenter.php
index 6ece763..18ea9bf 100644
--- a/Service/CreditNoteModalPresenter.php
+++ b/Service/CreditNoteModalPresenter.php
@@ -42,6 +42,9 @@ public function __construct(
      */
     public function build(CreditNote $creditNote, string $locale): array
     {
+        // A credit note without a language yet (a new one) gets its default on insert: the select
+        // offers it first, without value, so a change of order or customer in the modal moves it.
+        $defaultLanguage = null === $creditNote->getLangId() ? $this->language->defaultFor($creditNote) : null;
         $currencyId = $creditNote->getCurrencyId();
         $customer = $creditNote->getCustomer();
         $order = $creditNote->getOrder();
@@ -71,8 +74,8 @@ public function build(CreditNote $creditNote, string $locale): array
                 'comment' => '',
                 'lang_id' => $creditNote->getLangId(),
             ],
-            'languages' => $this->languages($creditNote),
-            'default_language' => $creditNote->getLangId() === null ? $this->language->defaultFor($creditNote)?->getTitle() : null,
+            'default_language' => null !== $defaultLanguage ? (string) $defaultLanguage->getTitle() : null,
+            'languages' => $this->languages($creditNote, $defaultLanguage?->getId()),
             'currencies' => $this->currencies(),
             'statuses' => $this->statuses($locale),
             'types' => $this->types($locale),
@@ -145,12 +148,18 @@ private function statuses(string $locale): array
     }
 
     /**
+     * The languages the credit note can take, but the default one: the first option already
+     * names it.
+     *
      * @return list<array{id:int,title:string}>
      */
-    private function languages(CreditNote $creditNote): array
+    private function languages(CreditNote $creditNote, ?int $defaultLanguageId): array
     {
         $out = [];
         foreach ($this->language->selectable($creditNote) as $lang) {
+            if ($lang->getId() === $defaultLanguageId) {
+                continue;
+            }
             $out[] = ['id' => $lang->getId(), 'title' => (string) $lang->getTitle()];
         }
 
diff --git a/templates/backOffice/default-twig/ajax/credit-note-modal.html.twig b/templates/backOffice/default-twig/ajax/credit-note-modal.html.twig
index 5f41037..5d13adf 100644
--- a/templates/backOffice/default-twig/ajax/credit-note-modal.html.twig
+++ b/templates/backOffice/default-twig/ajax/credit-note-modal.html.twig
@@ -58,8 +58,8 @@
       <div class="mb-3">
         <label class="form-label">{{ 'Language :'|trans({}, 'creditnote.bo.default') }}</label>
         <select class="form-select" name="credit_note_create[lang_id]">
-          {% if cn.lang_id is null %}
-            <option value="" selected>{{ 'Default (%language)'|trans({'%language': modal.default_language|default('')}, 'creditnote.bo.default') }}</option>
+          {% if cn.lang_id is null and modal.default_language %}
+            <option value="" selected>{{ modal.default_language }}</option>
           {% endif %}
           {% for language in modal.languages %}
             <option value="{{ language.id }}" {{ cn.lang_id == language.id ? 'selected' : '' }}>{{ language.title }}</option>
diff --git a/tests/Integration/CreditNoteLanguageRouteTest.php b/tests/Integration/CreditNoteLanguageRouteTest.php
index ae114ef..ebcfeab 100644
--- a/tests/Integration/CreditNoteLanguageRouteTest.php
+++ b/tests/Integration/CreditNoteLanguageRouteTest.php
@@ -87,6 +87,28 @@ public function aLanguageTheCreditNoteCannotHaveIsIgnored(): void
         self::assertSame($before, CreditNoteQuery::create()->findPk($creditNote->getId())->getLangId());
     }
 
+    #[Test]
+    public function theModalOfANewCreditNoteOffersEachLanguageOnce(): void
+    {
+        $customer = $this->fixture->customer();
+        $order = $this->fixture->paidOrder($customer);
+        $german = $this->activeLang('de_DE', 'de', 'Deutsch');
+        $order->setLangId($german->getId())->save($this->getPropelConnection());
+        $this->loginAdmin();
+
+        $crawler = $this->client->request('POST', '/admin/credit-note/ajax/modal/create', [
+            'credit_note_create' => ['action' => 'view', 'order_id' => $order->getId()],
+        ]);
+        $options = $crawler->filterXPath('//select[@name="credit_note_create[lang_id]"]/option');
+        $titles = $options->each(static fn ($option): string => trim($option->text()));
+
+        self::assertSame(200, $this->client->getResponse()->getStatusCode());
+        self::assertSame('', $options->first()->attr('value'), 'the first option leaves the language to its default');
+        self::assertSame($german->getTitle(), $titles[0], 'the default is the language of the order, named once');
+        self::assertSame(array_values(array_unique($titles)), $titles, 'no language is offered twice');
+        self::assertCount(1, array_keys($titles, $german->getTitle(), true));
+    }
+
     private function numberedCreditNote(): CreditNoteModel
     {
         $customer = $this->fixture->customer();

From 88304ed8a778ce506adc261556822ed33a1c5720 Mon Sep 17 00:00:00 2001
From: Thomas Da Silva <tdasilva@openstudio.fr>
Date: Mon, 19 Oct 2026 16:48:20 +0200
Subject: [PATCH 11/12] fix(#122): refuse a credit note without invoice address
 instead of an error 500

---
 CHANGELOG.md                                  |  1 +
 Controller/CreditNoteController.php           | 52 +++++++---
 ...editNoteInvoiceAddressMissingException.php | 17 ++++
 I18n/en_US.php                                |  1 +
 I18n/fr_FR.php                                |  1 +
 .../includes/credit-note-js.html.twig         | 10 +-
 .../CreditNoteInvoiceAddressTest.php          | 99 +++++++++++++++++++
 7 files changed, 161 insertions(+), 20 deletions(-)
 create mode 100644 Exception/CreditNoteInvoiceAddressMissingException.php
 create mode 100644 tests/Integration/CreditNoteInvoiceAddressTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 509f37b..a713c8c 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 - A credit note has a language (`lang_id`), chosen in the back-office modal: the language of its order by default, of its customer without an order, the default language of the shop otherwise. It stays editable once the credit note is numbered, since it only changes the printed document. The document is printed in it (still within `document_locales`). The update fills the existing credit notes with the language they were printed in: the one of their customer, of their order when the customer has none.
 - The colors of the status and type badges are written into `style` attributes only when they are hexadecimal colors, grey otherwise.
+- A credit note created or saved without an invoice address (no customer picked, or "Other" with the name left empty) is refused with a message, and nothing is written. The controller used to save the empty address, which a database in strict mode refuses with an error 500 (`Field 'firstname' doesn't have a default value`). The module's back-office messages use the `danger` type, the one the Twig back office styles.
 - After creating, updating or deleting a credit note, the administrator is back on the page the modal was opened from, on the tab that held it ("Credit note" of an order): the modal script sends that page as `success-url`, which the modal kept only from the query string. Only a path of the shop in printable ASCII is followed: an absolute or protocol-relative `success-url`, or one carrying a tab or a line break that the browser would drop, sends back to the order.
 - The "Credit Notes" section of the admin side menu is back, right below "Orders": its script looked for the `#orders_menu` entry of the Smarty back-office, absent from default-twig. It now follows the entry `[data-testid="bo-nav-order"]` of the default-twig side menu, which has no hook between sections.
 - Smarty is gone, as in Thelia 3: the Smarty plugin `credit_note_format_address`, the Smarty back-office and PDF templates, the Smarty fallback of the back-office hooks. The loops no Twig template calls are removed too: `credit-note-comment`, `credit-note-status`, `credit-note-type`, `order-credit-note` and `credit-note-version` (its table has not existed since 2.3.4). The loops `credit-note`, `credit-note-address` and `credit-note-detail` stay: the credit note document of the PDF template reads them.
diff --git a/Controller/CreditNoteController.php b/Controller/CreditNoteController.php
index f83160b..081e1de 100755
--- a/Controller/CreditNoteController.php
+++ b/Controller/CreditNoteController.php
@@ -17,6 +17,7 @@
 use CreditNote\Service\CreditNoteModalPresenter;
 use CreditNote\Service\CreditNotePdfRenderer;
 use CreditNote\Exception\CreditNoteExceedsOrderException;
+use CreditNote\Exception\CreditNoteInvoiceAddressMissingException;
 use Thelia\Model\ConfigQuery;
 use CreditNote\Model\Base\CreditNoteStatusQuery;
 use CreditNote\Model\CreditNote;
@@ -33,7 +34,6 @@
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\Form;
-use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -151,7 +151,7 @@ public function saveConfigAction(Request $request)
             CreditNoteModule::setConfigValue(CreditNoteModule::CONFIG_KEY_DOCUMENT_LOCALES, implode(',', array_filter(array_map('trim', explode(',', (string) ($data[CreditNoteModule::CONFIG_KEY_DOCUMENT_LOCALES] ?? ''))))));
         } catch (FormValidationException $e) {
             if ($request->hasSession()) {
-                $request->getSession()->getFlashBag()->add('error', $e->getMessage());
+                $request->getSession()->getFlashBag()->add('danger', $e->getMessage());
             }
         }
 
@@ -161,7 +161,11 @@ public function saveConfigAction(Request $request)
     #[Route('/credit-note/create', name: '_create', methods: 'POST')]
     public function createAction(Request $request, EventDispatcherInterface $eventDispatcher, ParserContext $parserContext, SecurityContext $securityContext, CreditNoteLanguage $language)
     {
-        $creditNote = $this->performCreditNote($eventDispatcher, $parserContext, $securityContext, $language);
+        try {
+            $creditNote = $this->performCreditNote($eventDispatcher, $parserContext, $securityContext, $language);
+        } catch (CreditNoteInvoiceAddressMissingException) {
+            return $this->refuseWithoutInvoiceAddress($request, null);
+        }
 
         $con = Propel::getServiceContainer()->getWriteConnection(CreditNoteTableMap::DATABASE_NAME);
 
@@ -174,7 +178,7 @@ public function createAction(Request $request, EventDispatcherInterface $eventDi
             $con->commit();
         } catch (CreditNoteExceedsOrderException $e) {
             $con->rollBack();
-            $request->getSession()->getFlashBag()->add('error', $this->exceedsOrderMessage($e));
+            $request->getSession()->getFlashBag()->add('danger', $this->exceedsOrderMessage($e));
         } catch (\Exception $e) {
             $con->rollBack();
             throw $e;
@@ -218,7 +222,11 @@ public function updateAction(Request $request, $id, EventDispatcherInterface $ev
             ->filterById($id, Criteria::EQUAL)
             ->findOne();
 
-        $creditNote = $this->performCreditNote($eventDispatcher, $parserContext, $securityContext, $language, $creditNote);
+        try {
+            $creditNote = $this->performCreditNote($eventDispatcher, $parserContext, $securityContext, $language, $creditNote);
+        } catch (CreditNoteInvoiceAddressMissingException) {
+            return $this->refuseWithoutInvoiceAddress($request, $creditNote);
+        }
 
         $con = Propel::getServiceContainer()->getWriteConnection(CreditNoteTableMap::DATABASE_NAME);
 
@@ -231,7 +239,7 @@ public function updateAction(Request $request, $id, EventDispatcherInterface $ev
             $con->commit();
         } catch (CreditNoteExceedsOrderException $e) {
             $con->rollBack();
-            $request->getSession()->getFlashBag()->add('error', $this->exceedsOrderMessage($e));
+            $request->getSession()->getFlashBag()->add('danger', $this->exceedsOrderMessage($e));
         } catch (\Exception $e) {
             $con->rollBack();
             throw $e;
@@ -247,7 +255,7 @@ public function updateAction(Request $request, $id, EventDispatcherInterface $ev
      * the browser drops tabs and line breaks from an address, so "/\t/host" would become the
      * protocol-relative "//host" of another site.
      */
-    private function redirectAfterSave(Request $request, CreditNote $creditNote): RedirectResponse
+    private function redirectAfterSave(Request $request, ?CreditNote $creditNote): RedirectResponse
     {
         $successUrl = (string) ($request->request->get('success-url') ?? $request->query->get('success-url') ?? '');
 
@@ -255,11 +263,29 @@ private function redirectAfterSave(Request $request, CreditNote $creditNote): Re
             return new RedirectResponse($successUrl);
         }
 
-        if (null !== $creditNote->getOrderId()) {
+        if (null !== $creditNote?->getOrderId()) {
             return new RedirectResponse($this->getRoute('admin.order.update.view', ['order_id' => $creditNote->getOrderId()], UrlGeneratorInterface::ABSOLUTE_PATH) . '#credit-note');
         }
 
-        return new RedirectResponse($this->getRoute('admin.customer.update.view', ['customer_id' => $creditNote->getCustomerId()], UrlGeneratorInterface::ABSOLUTE_PATH) . '#module-credit-note');
+        if (null !== $creditNote?->getCustomerId()) {
+            return new RedirectResponse($this->getRoute('admin.customer.update.view', ['customer_id' => $creditNote->getCustomerId()], UrlGeneratorInterface::ABSOLUTE_PATH));
+        }
+
+        return new RedirectResponse($this->getRoute('credit_note_list', [], UrlGeneratorInterface::ABSOLUTE_PATH));
+    }
+
+    /**
+     * Nothing is written, not even the empty address: the administrator goes back to the page
+     * the modal was opened from with the reason.
+     */
+    private function refuseWithoutInvoiceAddress(Request $request, ?CreditNote $creditNote): RedirectResponse
+    {
+        $request->getSession()->getFlashBag()->add(
+            'danger',
+            $this->getTranslator()->trans('Please select an invoice address', [], CreditNoteModule::DOMAIN_MESSAGE)
+        );
+
+        return $this->redirectAfterSave($request, $creditNote);
     }
 
     #[Route('/credit-note/{id}/_delete', name: '_delete', methods: 'POST', requirements: ['id' => '\d+'])]
@@ -270,7 +296,7 @@ public function deleteAction(Request $request, $id, Translator $translator)
         if (!empty($creditNote->getInvoiceRef())) {
             if ($request->hasSession()) {
                 $request->getSession()->getFlashBag()->set(
-                    'error',
+                    'danger',
                     $translator->trans("You can not delete this credit note", [], CreditNoteModule::DOMAIN_MESSAGE)
                 );
             }
@@ -473,11 +499,7 @@ protected function performInvoiceAddress(Form $formValidate, CreditNote $creditN
             }
 
             if (empty($creditNoteAddress->getLastname()) && ('create' === $action || 'update' === $action)) {
-                $formValidate->addError(
-                    new FormError('Please select a invoice address')
-                );
-
-                $creditNoteAddress->save();
+                throw new CreditNoteInvoiceAddressMissingException();
             }
 
             $creditNote->setCreditNoteAddress($creditNoteAddress);
diff --git a/Exception/CreditNoteInvoiceAddressMissingException.php b/Exception/CreditNoteInvoiceAddressMissingException.php
new file mode 100644
index 0000000..f516681
--- /dev/null
+++ b/Exception/CreditNoteInvoiceAddressMissingException.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CreditNote\Exception;
+
+/**
+ * A credit note was created or saved without an invoice address: no customer picked, or
+ * "Other" with the name left empty.
+ */
+final class CreditNoteInvoiceAddressMissingException extends \RuntimeException
+{
+    public function __construct()
+    {
+        parent::__construct('A credit note needs an invoice address.');
+    }
+}
diff --git a/I18n/en_US.php b/I18n/en_US.php
index a79a2be..eca0087 100755
--- a/I18n/en_US.php
+++ b/I18n/en_US.php
@@ -21,6 +21,7 @@
     'Invoices' => 'Invoices',
     'Next credit note reference number' => 'Next credit note reference number',
     'Next invoice reference number' => 'Next invoice reference number',
+    'Please select an invoice address' => 'Please select an invoice address',
     'Restrict coupon codes from order credit notes to the original customer' => 'Restrict coupon codes from order credit notes to the original customer',
     'Save' => 'Save',
     'Searching credit notes' => 'Searching credit notes',
diff --git a/I18n/fr_FR.php b/I18n/fr_FR.php
index 0bdd33a..a1b5aff 100755
--- a/I18n/fr_FR.php
+++ b/I18n/fr_FR.php
@@ -17,6 +17,7 @@
     'Invoices' => 'Factures',
     'Next credit note reference number' => 'Prochain numéro d\'avoir',
     'Next invoice reference number' => 'Prochain numéro de facture',
+    'Please select an invoice address' => 'Veuillez sélectionner une adresse de facturation',
     'Save' => 'Enregistrer',
     'Searching credit notes' => 'Recherche d\'avoirs',
     'To' => 'Jusqu\'au',
diff --git a/templates/backOffice/default-twig/CreditNote/includes/credit-note-js.html.twig b/templates/backOffice/default-twig/CreditNote/includes/credit-note-js.html.twig
index 46f45c6..5d49374 100644
--- a/templates/backOffice/default-twig/CreditNote/includes/credit-note-js.html.twig
+++ b/templates/backOffice/default-twig/CreditNote/includes/credit-note-js.html.twig
@@ -2,12 +2,12 @@
 <script type="text/javascript">
 "use strict";
 (function () {
-  /* The page a modal was opened from, back on the tab or block holding its trigger (#credit-note on an
-     order): where the module sends the administrator after a save or a delete. */
+  /* The page a modal was opened from, back on the tab holding its trigger (#credit-note on an order):
+     where the module sends the administrator after a save or a delete. Outside a tab, no fragment: the
+     page opens at the top, where the message of the save shows. */
   function returnUrl(trigger) {
-    // The tab first: on an order the credit note block sits inside the tab.
-    var holder = trigger && trigger.closest ? (trigger.closest('.tab-pane[id]') || trigger.closest('#module-credit-note')) : null;
-    return window.location.pathname + window.location.search + (holder ? '#' + holder.id : '');
+    var tab = trigger && trigger.closest ? trigger.closest('.tab-pane[id]') : null;
+    return window.location.pathname + window.location.search + (tab ? '#' + tab.id : '');
   }
 
   /* ---- back from a save: reopen the tab the fragment names ---- */
diff --git a/tests/Integration/CreditNoteInvoiceAddressTest.php b/tests/Integration/CreditNoteInvoiceAddressTest.php
new file mode 100644
index 0000000..caaafb6
--- /dev/null
+++ b/tests/Integration/CreditNoteInvoiceAddressTest.php
@@ -0,0 +1,99 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CreditNote\Tests\Integration;
+
+use CreditNote\CreditNote;
+use CreditNote\Model\CreditNoteAddressQuery;
+use CreditNote\Model\CreditNoteQuery;
+use CreditNote\Tests\Support\AdminSessionInjector;
+use CreditNote\Tests\Support\CreditNoteFixture;
+use PHPUnit\Framework\Attributes\Test;
+use Symfony\Component\HttpKernel\Event\ResponseEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Thelia\Model\ModuleQuery;
+use Thelia\Test\FixtureFactory;
+use Thelia\Test\WebIntegrationTestCase;
+
+/**
+ * A credit note needs an invoice address: one created without (no customer picked, or "Other"
+ * with empty fields) is refused with a message, and nothing is written, not even an empty
+ * address.
+ */
+final class CreditNoteInvoiceAddressTest extends WebIntegrationTestCase
+{
+    private CreditNoteFixture $fixture;
+
+    private AdminSessionInjector $injector;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        if (!ModuleQuery::create()->findOneByCode(CreditNote::getModuleCode())?->getActivate()) {
+            self::markTestSkipped('The CreditNote module is not active in the test database.');
+        }
+
+        $this->fixture = new CreditNoteFixture($this->getPropelConnection());
+        $this->injector = new AdminSessionInjector();
+        $this->getService(EventDispatcherInterface::class)->addSubscriber($this->injector);
+    }
+
+    protected function tearDown(): void
+    {
+        if (isset($this->injector)) {
+            $this->injector->clear();
+        }
+
+        parent::tearDown();
+    }
+
+    #[Test]
+    public function aCreditNoteWithoutInvoiceAddressIsRefusedAndNothingIsWritten(): void
+    {
+        $customer = $this->fixture->customer();
+        $creditNotes = CreditNoteQuery::create()->count();
+        $addresses = CreditNoteAddressQuery::create()->count();
+        $this->loginAdmin();
+
+        // The flash bag of the request, read before the session is saved.
+        $errors = [];
+        $readErrors = static function (ResponseEvent $event) use (&$errors): void {
+            if ($event->getRequest()->hasSession()) {
+                $errors = $event->getRequest()->getSession()->getFlashBag()->peek('danger');
+            }
+        };
+        $dispatcher = $this->getService(EventDispatcherInterface::class);
+        $dispatcher->addListener(KernelEvents::RESPONSE, $readErrors);
+
+        $this->client->request('POST', '/admin/credit-note/create', [
+            'success-url' => \sprintf('/admin/customer/update?customer_id=%d', $customer->getId()),
+            'credit_note_create' => [
+                'action' => 'create',
+                'customer_id' => $customer->getId(),
+                'ui_target' => 'customer',
+                'ui_target_id' => $customer->getId(),
+            ],
+        ]);
+        $response = $this->client->getResponse();
+        $dispatcher->removeListener(KernelEvents::RESPONSE, $readErrors);
+
+        self::assertTrue($response->isRedirection(), (string) $response->getContent());
+        self::assertSame(\sprintf('/admin/customer/update?customer_id=%d', $customer->getId()), $response->headers->get('Location'));
+        self::assertSame($creditNotes, CreditNoteQuery::create()->count(), 'no credit note written');
+        self::assertSame($addresses, CreditNoteAddressQuery::create()->count(), 'no empty address written');
+        self::assertNotEmpty($errors, 'the administrator is told why');
+    }
+
+    private function loginAdmin(): void
+    {
+        // Built directly rather than through createFixtureFactory(): that helper pushes a
+        // synthetic request on the stack, which would become the main request the security
+        // context resolves the session from for every request the client sends afterwards.
+        $admin = (new FixtureFactory($this->getPropelConnection()))->admin();
+        $admin->eraseCredentials();
+        $this->injector->setAdmin($admin);
+    }
+}

From f5073e38ba1f854292da05a1864b4da4ec91cd7f Mon Sep 17 00:00:00 2001
From: Thomas Da Silva <tdasilva@openstudio.fr>
Date: Mon, 19 Oct 2026 16:56:57 +0200
Subject: [PATCH 12/12] fix(#122): run the update scripts up to the target
 version only

---
 CHANGELOG.md   | 1 +
 CreditNote.php | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a713c8c..472b997 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 - A credit note has a language (`lang_id`), chosen in the back-office modal: the language of its order by default, of its customer without an order, the default language of the shop otherwise. It stays editable once the credit note is numbered, since it only changes the printed document. The document is printed in it (still within `document_locales`). The update fills the existing credit notes with the language they were printed in: the one of their customer, of their order when the customer has none.
 - The colors of the status and type badges are written into `style` attributes only when they are hexadecimal colors, grey otherwise.
 - A credit note created or saved without an invoice address (no customer picked, or "Other" with the name left empty) is refused with a message, and nothing is written. The controller used to save the empty address, which a database in strict mode refuses with an error 500 (`Field 'firstname' doesn't have a default value`). The module's back-office messages use the `danger` type, the one the Twig back office styles.
+- `update()` runs the scripts of `Config/Update/sql/` from the version installed up to the target version only, compared by version (the file name without `.sql`). It used to run every script above the installed version, which replayed `4.3.0.sql` on a shop already at 4.3.0.
 - After creating, updating or deleting a credit note, the administrator is back on the page the modal was opened from, on the tab that held it ("Credit note" of an order): the modal script sends that page as `success-url`, which the modal kept only from the query string. Only a path of the shop in printable ASCII is followed: an absolute or protocol-relative `success-url`, or one carrying a tab or a line break that the browser would drop, sends back to the order.
 - The "Credit Notes" section of the admin side menu is back, right below "Orders": its script looked for the `#orders_menu` entry of the Smarty back-office, absent from default-twig. It now follows the entry `[data-testid="bo-nav-order"]` of the default-twig side menu, which has no hook between sections.
 - Smarty is gone, as in Thelia 3: the Smarty plugin `credit_note_format_address`, the Smarty back-office and PDF templates, the Smarty fallback of the back-office hooks. The loops no Twig template calls are removed too: `credit-note-comment`, `credit-note-status`, `credit-note-type`, `order-credit-note` and `credit-note-version` (its table has not existed since 2.3.4). The loops `credit-note`, `credit-note-address` and `credit-note-detail` stay: the credit note document of the PDF template reads them.
diff --git a/CreditNote.php b/CreditNote.php
index 38ba416..325eee9 100755
--- a/CreditNote.php
+++ b/CreditNote.php
@@ -78,8 +78,13 @@ public function update($currentVersion, $newVersion, ?ConnectionInterface $con =
             ->in(__DIR__ ."/Config/Update/")
             ->sort($sort);
 
+        // The scripts of the versions this update crosses only: above the version installed, up
+        // to the one installed now. A script above the target describes a schema the shop does
+        // not have yet, or already has when it was installed at that version.
         foreach ($files as $file) {
-            if (version_compare($file->getFilename(), $currentVersion, ">")) {
+            $version = substr($file->getFilename(), 0, -4);
+
+            if (version_compare($version, (string) $currentVersion, '>') && version_compare($version, (string) $newVersion, '<=')) {
                 $sqlToExecute[$file->getFilename()] = $file->getRealPath();
             }
         }