From 4dbed777ebf3dd24aa774a82374097c4456cac17 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 1 May 2024 19:33:14 +0200 Subject: [PATCH] More info in tooltip --- htdocs/comm/action/card.php | 12 ++++++++---- htdocs/core/class/commonobject.class.php | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 6e1361287b82a..31eaded4402e5 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -1766,7 +1766,7 @@ function selectremindertype() { $head = actions_prepare_head($object); $now = dol_now(); - $delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60; + $delay_warning = getDolGlobalInt('MAIN_DELAY_ACTIONS_TODO') * 24 * 60 * 60; // Confirmation suppression action @@ -2292,13 +2292,17 @@ function setdatefields() print '
'; - // Affichage fiche action en mode visu - print ''; + // Show event in view mode + print '
'; // Type if (getDolGlobalString('AGENDA_USE_EVENT_TYPE')) { print ''; } diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index efb8db72ed5a9..faf8ccc4a5bbd 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -617,7 +617,7 @@ abstract class CommonObject public $lines; /** - * @var string Action code to use to record auto event in agenda. For example 'AC_OTH_AUTO' + * @var string Action type code to use to record auto event in agenda. For example 'AC_OTH_AUTO' */ public $actiontypecode;
'.$langs->trans("Type").''; - print $object->getTypePicto(); + $labeltoshow = $langs->trans("Action".$object->type_code); + if ($object->code) { + $labeltoshow .= ' ('.$object->code.')'; + } + print $object->getTypePicto('pictofixedwidth paddingright', $labeltoshow); print $langs->trans("Action".$object->type_code); print '