From b0a67d5c4d9a952e83a1786541153deff8729c8f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 21 Jan 2026 12:27:46 +0100 Subject: [PATCH 1/3] Fix ci --- htdocs/admin/order.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/admin/order.php b/htdocs/admin/order.php index 566af84c5b5..d39ac08fdb1 100644 --- a/htdocs/admin/order.php +++ b/htdocs/admin/order.php @@ -312,7 +312,7 @@ foreach ($dirmodels as $reldir) { require_once $dir.$file.'.php'; $module = new $file($db); - /** @var ModeleNumRefCommande $module */ + /** @var ModeleNumRefCommandes $module */ '@phan-var-force ModeleNumRefCommandes $module'; $arrayofmodules[] = $module; @@ -325,8 +325,8 @@ foreach ($dirmodels as $reldir) { } $arrayofmodules = dol_sort_array($arrayofmodules, 'position'); -/** @var ModeleNumRefCommande[] $arrayofmodules */ -'@phan-var-force ModeleNumRefCommande[] $arrayofmodules'; +/** @var ModeleNumRefCommandes[] $arrayofmodules */ +'@phan-var-force ModeleNumRefCommandes[] $arrayofmodules'; foreach ($arrayofmodules as $module) { $file = strtolower($module->getName($langs)); From 7c533b70682f7d384ca2a81ec2b0c9c2062d7037 Mon Sep 17 00:00:00 2001 From: Lucas Marcouiller <45882981+Hystepik@users.noreply.github.com> Date: Wed, 21 Jan 2026 12:28:05 +0100 Subject: [PATCH 2/3] Fix email layout selector for product (#36948) Co-authored-by: Lucas Marcouiller --- htdocs/core/ajax/mailtemplate.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/core/ajax/mailtemplate.php b/htdocs/core/ajax/mailtemplate.php index 5f6c583412f..bff5def7a2f 100644 --- a/htdocs/core/ajax/mailtemplate.php +++ b/htdocs/core/ajax/mailtemplate.php @@ -162,6 +162,9 @@ if (GETPOSTISSET('template')) { $selectedIdsStr = GETPOST('selectedPosts', 'alpha'); //$selectedPosts = array(); $selectedIds = json_decode($selectedIdsStr); + if (is_numeric($selectedIds)) { + $selectedIds = array($selectedIds); + } /*if (is_array($selectedPostsStr)) { $selectedPosts = explode(',', $selectedPostsStr); }*/ From d4602e6b6f9a7b76de9bb4199edf9fd752e48789 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 21 Jan 2026 12:31:38 +0100 Subject: [PATCH 3/3] Fix ci --- htdocs/compta/paiement/cheque/card.php | 2 +- htdocs/loan/schedule.php | 1 - htdocs/user/credentials.php | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php index b775a2b27f1..6e3b1f2e358 100644 --- a/htdocs/compta/paiement/cheque/card.php +++ b/htdocs/compta/paiement/cheque/card.php @@ -529,7 +529,7 @@ if ($action == 'new') { print ''; print ''; - print_fiche_titre($account_label, '', ''); + print load_fiche_titre($account_label, '', ''); $moreforfilter = ''; print '
'; diff --git a/htdocs/loan/schedule.php b/htdocs/loan/schedule.php index c61643af829..1047440dfaa 100644 --- a/htdocs/loan/schedule.php +++ b/htdocs/loan/schedule.php @@ -270,7 +270,6 @@ if (count($echeances->lines) > 0) { print ''; } -//print_fiche_titre($langs->trans("FinancialCommitment")); print '
'; print '
'; diff --git a/htdocs/user/credentials.php b/htdocs/user/credentials.php index 0fc99e69291..503527c727e 100644 --- a/htdocs/user/credentials.php +++ b/htdocs/user/credentials.php @@ -325,8 +325,6 @@ if (empty($listoftotps)) { print ''.$langs->trans("NoRecordFound").''; } -//print_fiche_titre($langs->trans("ApiKey")); - print ''."\n"; print '
'."\n";