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

Fix tooltip

Browse Source
This commit is contained in:
Laurent Destailleur 2020-08-30 19:45:46 +02:00
parent d35e374584
commit 02f108835d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/lib/project.lib.php
View File

@ -2144,7 +2144,8 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
if (empty($arrayidofprojects)) $arrayidofprojects[0] = -1; if (empty($arrayidofprojects)) $arrayidofprojects[0] = -1;
// Get list of project with calculation on tasks // Get list of project with calculation on tasks
$sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc, s.nom as socname, p.fk_user_creat, p.public, p.fk_statut as status, p.fk_opp_status as opp_status, p.opp_percent, p.opp_amount,"; $sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc, s.nom as socname, s.email, s.client, s.fournisseur,";
$sql2 .= " p.fk_user_creat, p.public, p.fk_statut as status, p.fk_opp_status as opp_status, p.opp_percent, p.opp_amount,";
$sql2 .= " p.dateo, p.datee,"; $sql2 .= " p.dateo, p.datee,";
$sql2 .= " COUNT(t.rowid) as nb, SUM(t.planned_workload) as planned_workload, SUM(t.planned_workload * t.progress / 100) as declared_progess_workload"; $sql2 .= " COUNT(t.rowid) as nb, SUM(t.planned_workload) as planned_workload, SUM(t.planned_workload * t.progress / 100) as declared_progess_workload";
$sql2 .= " FROM ".MAIN_DB_PREFIX."projet as p"; $sql2 .= " FROM ".MAIN_DB_PREFIX."projet as p";
@ -2197,7 +2198,6 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
if ($userAccess >= 0) if ($userAccess >= 0)
{ {
$projectstatic->ref = $objp->ref; $projectstatic->ref = $objp->ref;
$projectstatic->statut = $objp->status; // deprecated
$projectstatic->status = $objp->status; $projectstatic->status = $objp->status;
$projectstatic->title = $objp->title; $projectstatic->title = $objp->title;
$projectstatic->datee = $db->jdate($objp->datee); $projectstatic->datee = $db->jdate($objp->datee);
@ -2216,6 +2216,9 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
$thirdpartystatic->id = $objp->fk_soc; $thirdpartystatic->id = $objp->fk_soc;
$thirdpartystatic->ref = $objp->socname; $thirdpartystatic->ref = $objp->socname;
$thirdpartystatic->name = $objp->socname; $thirdpartystatic->name = $objp->socname;
$thirdpartystatic->client = $objp->client;
$thirdpartystatic->fournisseur = $objp->fournisseur;
$thirdpartystatic->email = $objp->email;
print $thirdpartystatic->getNomUrl(1); print $thirdpartystatic->getNomUrl(1);
} }
print '</td>'; print '</td>';

4
htdocs/projet/index.php
View File

@ -337,11 +337,13 @@ if ($resql)
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td class="nowraponall tdoverflowmax100">'; print '<td class="nowraponall tdoverflowmax100">';
if ($obj->socid) if ($obj->socid > 0)
{ {
$companystatic->id = $obj->socid; $companystatic->id = $obj->socid;
$companystatic->name = $obj->name; $companystatic->name = $obj->name;
$companystatic->email = $obj->email; $companystatic->email = $obj->email;
$companystatic->client = $obj->client;
$companystatic->fournisseur = $obj->fournisseur;
$companystatic->status = $obj->status; $companystatic->status = $obj->status;
print $companystatic->getNomUrl(1); print $companystatic->getNomUrl(1);