lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Missing label

Browse Source
This commit is contained in:
Laurent Destailleur 2014-11-03 18:00:11 +01:00
parent 54e2803926
commit a4a01de8a1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/agenda.lib.php
View File

@ -206,7 +206,7 @@ function show_array_actions_to_do($max=5)
include_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php'; include_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
$sql = "SELECT a.id, a.label, a.datep as dp, a.datep2 as dp2, a.fk_user_author, a.percent,"; $sql = "SELECT a.id, a.label, a.datep as dp, a.datep2 as dp2, a.fk_user_author, a.percent,";
$sql.= " c.code, c.libelle,"; $sql.= " c.code, c.libelle as type_label,";
$sql.= " s.nom as sname, s.rowid, s.client"; $sql.= " s.nom as sname, s.rowid, s.client";
$sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c LEFT JOIN "; $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c LEFT JOIN ";
$sql.= " ".MAIN_DB_PREFIX."actioncomm as a ON c.id = a.fk_action"; $sql.= " ".MAIN_DB_PREFIX."actioncomm as a ON c.id = a.fk_action";
@ -243,7 +243,7 @@ function show_array_actions_to_do($max=5)
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
$staticaction->type_code=$obj->code; $staticaction->type_code=$obj->code;
$staticaction->libelle=$obj->label; $staticaction->label=($obj->label?$obj->label:$obj->type_label);
$staticaction->id=$obj->id; $staticaction->id=$obj->id;
print '<td>'.$staticaction->getNomUrl(1,34).'</td>'; print '<td>'.$staticaction->getNomUrl(1,34).'</td>';