From afad3190a13b09976a71cb87312e9b334a4ea3b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 16 Apr 2026 13:18:21 +0200 Subject: [PATCH 1/3] fix CI (#37896) --- htdocs/ai/admin/custom_prompt.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/ai/admin/custom_prompt.php b/htdocs/ai/admin/custom_prompt.php index 373bdaca922..87980d5b3df 100644 --- a/htdocs/ai/admin/custom_prompt.php +++ b/htdocs/ai/admin/custom_prompt.php @@ -1,7 +1,7 @@ * Copyright (C) 2022 Alice Adminson - * Copyright (C) 2024-2025 Frédéric France + * Copyright (C) 2024-2026 Frédéric France * Coryright (C) 2024 Alexandre Spangaro * * This program is free software: you can redistribute it and/or modify @@ -249,7 +249,7 @@ if ($action == 'deleteproperty') { } if ($action == 'create') { - $out .= '
'; + $out = '
'; $out .= '
'; $out .= ''; From 90320625b958627339f47d3bb5728d1fbc98394d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 16 Apr 2026 13:18:37 +0200 Subject: [PATCH 2/3] Update config for tx transifex (#37897) --- .tx/config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.tx/config b/.tx/config index 210044edf24..e87397d3515 100644 --- a/.tx/config +++ b/.tx/config @@ -302,6 +302,12 @@ source_file = htdocs/langs/en_US/propal.lang source_lang = en_US type = MOZILLAPROPERTIES +[o:dolibarr-association:p:dolibarr:r:quickmemo] +file_filter = htdocs/langs//quickmemo.lang +source_file = htdocs/langs/en_US/quickmemo.lang +source_lang = en_US +type = MOZILLAPROPERTIES + [o:dolibarr-association:p:dolibarr:r:receiptprinter] file_filter = htdocs/langs//receiptprinter.lang source_file = htdocs/langs/en_US/receiptprinter.lang From a5e9489feecda253845b4951c1bc68de70590751 Mon Sep 17 00:00:00 2001 From: John BOTELLA <68917336+thersane-john@users.noreply.github.com> Date: Thu, 16 Apr 2026 13:41:26 +0200 Subject: [PATCH 3/3] Fix : polisk module quick memo (#37894) Co-authored-by: Laurent Destailleur --- htdocs/quickmemo/admin/setup.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/htdocs/quickmemo/admin/setup.php b/htdocs/quickmemo/admin/setup.php index dbbeb8cd3f0..5393257f58f 100644 --- a/htdocs/quickmemo/admin/setup.php +++ b/htdocs/quickmemo/admin/setup.php @@ -130,8 +130,7 @@ llxHeader('', $langs->trans($title), $help_url, '', 0, 0, '', ['quickmemo/css/se - -if ($action == 'edit') : ?> +?> -'.img_picto($langs->trans("BackToModuleList"), 'back', 'class="pictofixedwidth"').''.$langs->trans("BackToModuleList").''; @@ -260,7 +264,7 @@ print load_fiche_titre($langs->trans($title), $linkback, 'title_setup'); // Configuration header $head = quickmemoAdminPrepareHead(); -print dol_get_fiche_head($head, 'settings', $langs->trans($title), -1, "quickmemo@quickmemo"); +print dol_get_fiche_head($head, 'settings', $langs->trans($title), -1, "fa-sticky-note_fa"); // Setup page goes here echo ''.$langs->trans("QuickMemoSetupPage").'

';