diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 30ba71665ea..54c113fb06e 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -519,7 +519,7 @@ class ActionComm extends CommonObject /** * Return label of action status * @param percent Percent - * @param mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto + * @param mode 0=Long label, 1=Short label, 2=Picto+Short label, 3=Picto, 4=Picto+Short label, 5=Short label+Picto, 6=Very short label+Picto * @param hidenastatus 1=Show nothing if status is "Not applicable" * @return string Label */ @@ -566,9 +566,16 @@ class ActionComm extends CommonObject { if ($percent==-1 && ! $hidenastatus) return img_picto($langs->trans('StatusNotApplicable'),'statut9'); if ($percent==0) return '0% '.img_picto($langs->trans('StatusActionToDo'),'statut1'); - if ($percent > 0 && $percent < 100) return $percent.'% '.img_picto($langs->trans('StatusActionInProcess'),'statut3'); + if ($percent > 0 && $percent < 100) return $percent.'% '.img_picto($langs->trans('StatusActionInProcess').' - '.$percent.'%','statut3'); if ($percent >= 100) return $langs->trans('StatusActionDone').' '.img_picto($langs->trans('StatusActionDone'),'statut6'); } + if ($mode == 6) + { + if ($percent==-1 && ! $hidenastatus) return img_picto($langs->trans('StatusNotApplicable'),'statut9'); + if ($percent==0) return '0% '.img_picto($langs->trans('StatusActionToDo'),'statut1'); + if ($percent > 0 && $percent < 100) return $percent.'% '.img_picto($langs->trans('StatusActionInProcess').' - '.$percent.'%','statut3'); + if ($percent >= 100) return img_picto($langs->trans('StatusActionDone'),'statut6'); + } return ''; } diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 4c03cd42caa..6e9d2505eaa 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -243,7 +243,7 @@ if ($resql) $actionstatic->id=$obj->id; $actionstatic->type_code=$obj->acode; $actionstatic->libelle=$obj->label; - print $actionstatic->getNomUrl(1,20); + print $actionstatic->getNomUrl(1,28); print ''; // Titre @@ -272,7 +272,7 @@ if ($resql) $societestatic->id=$obj->socid; $societestatic->client=$obj->client; $societestatic->nom=$obj->societe; - print $societestatic->getNomUrl(1,'',6); + print $societestatic->getNomUrl(1,'',10); } else print ' '; print ''; @@ -284,7 +284,7 @@ if ($resql) $contactstatic->name=$obj->name; $contactstatic->firstname=$obj->firstname; $contactstatic->id=$obj->fk_contact; - print $contactstatic->getNomUrl(1,'',6); + print $contactstatic->getNomUrl(1,'',10); } else { @@ -329,7 +329,7 @@ if ($resql) print ''; // Status/Percent - print '