diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php
index 8a3f557a260..3d8d4f37303 100644
--- a/htdocs/lib/company.lib.php
+++ b/htdocs/lib/company.lib.php
@@ -552,7 +552,7 @@ function show_actions_todo($conf,$langs,$db,$object,$objcon='',$noprint=0)
$out.='
';
$out.='';
- $out.='| '.$langs->trans("ActionsToDoShort").' | | ';
+ $out.=''.$langs->trans("ActionsToDoShort").' | | ';
$out.='
';
$sql = "SELECT a.id, a.label,";
@@ -601,23 +601,17 @@ function show_actions_todo($conf,$langs,$db,$object,$objcon='',$noprint=0)
else $out.=' ';
$out.='';
- if ($obj->fk_element && $obj->elementtype == "propal")
- {
- $out.=''.img_object($langs->trans("ShowAction"),"task");
- $transcode=$langs->trans("Action".$obj->acode);
- $libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);
- $out.=$libelle;
- $out.=' | ';
- }
- else
- {
- $actionstatic->type_code=$obj->acode;
- $actionstatic->libelle=$obj->libelle;
- $actionstatic->id=$obj->id;
- $out.=''.$actionstatic->getNomUrl(1,16).' | ';
- }
+ $actionstatic->type_code=$obj->acode;
+ $transcode=$langs->trans("Action".$obj->acode);
+ $libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);
+ //$actionstatic->libelle=$libelle;
+ $actionstatic->libelle=$obj->label;
+ $actionstatic->id=$obj->id;
+ //$out.=''.$actionstatic->getNomUrl(1,16).' | ';
- $out.=''.$obj->label.' | ';
+ // Title of event
+ //$out.=''.dol_trunc($obj->label,40).' | ';
+ $out.=''.$actionstatic->getNomUrl(1,40).' | ';
// Contact pour cette action
if (! $objcon->id && $obj->fk_contact > 0)
@@ -778,7 +772,7 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
$actionstatic=new ActionComm($db);
$userstatic=new User($db);
$contactstatic = new Contact($db);
-
+
// TODO uniformize
$propalstatic=new Propal($db);
$orderstatic=new Commande($db);
@@ -787,7 +781,7 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
$out.="\n";
$out.='';
$out.='';
- $out.='| '.$langs->trans("ActionsDoneShort").' | ';
+ $out.=''.$langs->trans("ActionsDoneShort").' | ';
$out.='
';
foreach ($histo as $key=>$value)
@@ -802,25 +796,28 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
$out.=' | ';
// Action
- $out.='';
+ $out.=' | ';
if ($histo[$key]['type']=='action')
{
$actionstatic->type_code=$histo[$key]['acode'];
- $actionstatic->libelle=$histo[$key]['libelle'];
+ $transcode=$langs->trans("Action".$histo[$key]['acode']);
+ $libelle=($transcode!="Action".$histo[$key]['acode']?$transcode:$histo[$key]['libelle']);
+ //$actionstatic->libelle=$libelle;
+ $actionstatic->libelle=$histo[$key]['note'];
$actionstatic->id=$histo[$key]['id'];
- $out.=$actionstatic->getNomUrl(1,16);
+ $out.=$actionstatic->getNomUrl(1,40);
}
if ($histo[$key]['type']=='mailing')
{
$out.=''.img_object($langs->trans("ShowEMailing"),"email").' ';
$transcode=$langs->trans("Action".$histo[$key]['acode']);
$libelle=($transcode!="Action".$histo[$key]['acode']?$transcode:'Send mass mailing');
- $out.=dol_trunc($libelle,30);
+ $out.=dol_trunc($libelle,40);
}
$out.=' | ';
- // Note
- $out.=''.dol_trunc($histo[$key]['note'], 30).' | ';
+ // Title of event
+ //$out.=''.dol_trunc($histo[$key]['note'], 40).' | ';
// Objet lie
// TODO uniformize