From e50f144bc733b1ae6ccf98b1294428b3d42c0a1d Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Wed, 13 Dec 2023 15:15:04 +0100 Subject: [PATCH 1/4] display html notes --- htdocs/commande/list.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 8c8f661fac8..b3c52ee3318 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -2579,8 +2579,8 @@ while ($i < $imaxinloop) { // Note public if (!empty($arrayfields['c.note_public']['checked'])) { - print ''; - print dol_string_nohtmltag($obj->note_public); + print ''; + print dol_string_onlythesehtmltags($obj->note_public); print ''; if (!$i) { $totalarray['nbfield']++; @@ -2589,8 +2589,8 @@ while ($i < $imaxinloop) { // Note private if (!empty($arrayfields['c.note_private']['checked'])) { - print ''; - print dol_string_nohtmltag($obj->note_private); + print ''; + print dol_string_onlythesehtmltags($obj->note_private); print ''; if (!$i) { $totalarray['nbfield']++; From 19d440bf9df808ba542411e0aef8f1576f71b074 Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Wed, 13 Dec 2023 15:18:14 +0100 Subject: [PATCH 2/4] display html notes on propals --- htdocs/comm/propal/list.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 97e2a1d4307..e19b3916419 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -2321,8 +2321,8 @@ if ($search_date_signature_endyear) { } // Note public if (!empty($arrayfields['p.note_public']['checked'])) { - print ''; - print dol_string_nohtmltag($obj->note_public); + print ''; + print dol_string_onlythesehtmltags($obj->note_public); print ''; if (!$i) { $totalarray['nbfield']++; @@ -2330,8 +2330,8 @@ if ($search_date_signature_endyear) { } // Note private if (!empty($arrayfields['p.note_private']['checked'])) { - print ''; - print dol_string_nohtmltag($obj->note_private); + print ''; + print dol_string_onlythesehtmltags($obj->note_private); print ''; if (!$i) { $totalarray['nbfield']++; From 19c44826633f8e474f0c7cc6f6993f4cdc66b72f Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Thu, 14 Dec 2023 09:47:57 +0100 Subject: [PATCH 3/4] better fix --- htdocs/comm/propal/list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index e19b3916419..cd0e876c642 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -2322,7 +2322,7 @@ if ($search_date_signature_endyear) { // Note public if (!empty($arrayfields['p.note_public']['checked'])) { print ''; - print dol_string_onlythesehtmltags($obj->note_public); + print dolPrintHTML($obj->note_public); print ''; if (!$i) { $totalarray['nbfield']++; @@ -2331,7 +2331,7 @@ if ($search_date_signature_endyear) { // Note private if (!empty($arrayfields['p.note_private']['checked'])) { print ''; - print dol_string_onlythesehtmltags($obj->note_private); + print dolPrintHTML($obj->note_private); print ''; if (!$i) { $totalarray['nbfield']++; From d97dcb25388ea52549257e23787463a5db70677f Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Thu, 14 Dec 2023 09:49:18 +0100 Subject: [PATCH 4/4] better fix --- htdocs/commande/list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index b3c52ee3318..7d3815d40ec 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -2580,7 +2580,7 @@ while ($i < $imaxinloop) { // Note public if (!empty($arrayfields['c.note_public']['checked'])) { print ''; - print dol_string_onlythesehtmltags($obj->note_public); + print dolPrintHTML($obj->note_public); print ''; if (!$i) { $totalarray['nbfield']++; @@ -2590,7 +2590,7 @@ while ($i < $imaxinloop) { // Note private if (!empty($arrayfields['c.note_private']['checked'])) { print ''; - print dol_string_onlythesehtmltags($obj->note_private); + print dolPrintHTML($obj->note_private); print ''; if (!$i) { $totalarray['nbfield']++;